diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qml/qml.pro | 7 | ||||
-rw-r--r-- | tools/qmlplugindump/main.cpp | 17 | ||||
-rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 9 | ||||
-rw-r--r-- | tools/tools.pro | 7 |
4 files changed, 24 insertions, 16 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 80b1e19a..f9106876 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,6 +1,4 @@ -TEMPLATE = app CONFIG += uic declarative_debug declarative -DESTDIR = $$QT.declarative.bins include(qml.pri) @@ -8,9 +6,6 @@ SOURCES += main.cpp DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target - wince* { QT += xml @@ -35,3 +30,5 @@ mac { } else { TARGET=qmlviewer } + +load(qt_app) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 8d87c750..2b2bb85a 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -314,17 +314,13 @@ public: qSort(exportStrings); qml->writeArrayBinding(QLatin1String("exports"), exportStrings); - // write meta object revisions unless they're all zero + // write meta object revisions QStringList metaObjectRevisions; - bool shouldWriteMetaObjectRevisions = false; foreach (const QString &exportString, exportStrings) { int metaObjectRevision = exports[exportString]->metaObjectRevision(); - if (metaObjectRevision != 0) - shouldWriteMetaObjectRevisions = true; metaObjectRevisions += QString::number(metaObjectRevision); } - if (shouldWriteMetaObjectRevisions) - qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), metaObjectRevisions); + qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), metaObjectRevisions); if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) { // Can happen when a type is registered that returns itself as attachedPropertiesType() @@ -528,7 +524,7 @@ void sigSegvHandler(int) { void printUsage(const QString &appName) { qWarning() << qPrintable(QString( - "Usage: %1 [-v] [-notrelocatable] module.uri version [module/import/path]\n" + "Usage: %1 [-v] [-[non]relocatable] module.uri version [module/import/path]\n" " %1 [-v] -path path/to/qmldir/directory [version]\n" " %1 [-v] -builtins\n" "Example: %1 Qt.labs.particles 1.0 /home/user/dev/qt-install/imports").arg( @@ -579,8 +575,13 @@ int main(int argc, char *argv[]) } if (arg == QLatin1String("--notrelocatable") - || arg == QLatin1String("-notrelocatable")) { + || arg == QLatin1String("-notrelocatable") + || arg == QLatin1String("--nonrelocatable") + || arg == QLatin1String("-nonrelocatable")) { relocatable = false; + } else if (arg == QLatin1String("--relocatable") + || arg == QLatin1String("-relocatable")) { + relocatable = true; } else if (arg == QLatin1String("--path") || arg == QLatin1String("-path")) { action = Path; diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index ba71223b..cf812859 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -11,7 +11,12 @@ SOURCES += \ HEADERS += \ qmlstreamwriter.h -OTHER_FILES += Info.plist -macx: QMAKE_INFO_PLIST = Info.plist +mac { + # Prevent qmlplugindump from popping up in the dock when launched. + # We embed the Info.plist file, so the application doesn't need to + # be a bundle. + QMAKE_LFLAGS += -sectcreate __TEXT __info_plist $$shell_quote($$PWD/Info.plist) + CONFIG -= app_bundle +} load(qt_tool) diff --git a/tools/tools.pro b/tools/tools.pro index 5d3fa37b..f37bead6 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,7 @@ TEMPLATE = subdirs -!ios: SUBDIRS += qml qmlplugindump +SUBDIRS += qml qmlplugindump + +qtNomakeTools( \ + qml \ + qmlplugindump \ +) |