mirror of
https://gitlab.com/eql/lqml.git
synced 2025-12-16 07:10:54 -08:00
a bunch of revisions
This commit is contained in:
parent
1220bf06dc
commit
113386fdae
16 changed files with 109 additions and 112 deletions
|
|
@ -51,12 +51,12 @@ int main(int argc, char* argv[]) {
|
|||
|
||||
new QQmlFileSelector(view.engine(), &view);
|
||||
QString qml("qml/main.qml");
|
||||
QUrl url("qrc:///" + qml);
|
||||
QUrl url("qrc:///" + qml); // (1) try resources first (final app)
|
||||
bool set = false;
|
||||
if (QFile::exists(url.fileName())) {
|
||||
set = true;
|
||||
} else {
|
||||
url = QUrl::fromLocalFile(qml);
|
||||
url = QUrl::fromLocalFile(qml); // (2) use local file (development)
|
||||
if (QFile::exists(QDir::currentPath() + "/" + qml)) {
|
||||
set = true;
|
||||
}
|
||||
|
|
@ -81,10 +81,11 @@ int main(int argc, char* argv[]) {
|
|||
bool slime = false;
|
||||
if (arguments.contains("-slime")
|
||||
#if QT_VERSION < 0x060000
|
||||
|| (arguments.indexOf(QRegularExpression::wildcardToRegularExpression("*start-swank*.lisp")) != -1)) {
|
||||
|| (arguments.indexOf(QRegularExpression::wildcardToRegularExpression("*start-swank*.lisp")) != -1)
|
||||
#else
|
||||
|| (arguments.indexOf(QRegularExpression::fromWildcard(QString("*start-swank*.lisp"))) != -1)) {
|
||||
|| (arguments.indexOf(QRegularExpression::fromWildcard(QString("*start-swank*.lisp"))) != -1)
|
||||
#endif
|
||||
) {
|
||||
arguments.removeAll("-slime");
|
||||
slime = true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue