diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qml/qml.pro | 9 | ||||
-rw-r--r-- | tools/qmlcachegen/qmlcachegen.pro | 2 | ||||
-rw-r--r-- | tools/qmleasing/qmleasing.pro | 9 | ||||
-rw-r--r-- | tools/qmlimportscanner/qmlimportscanner.pro | 9 | ||||
-rw-r--r-- | tools/qmljs/qmljs.pro | 9 | ||||
-rw-r--r-- | tools/qmllint/qmllint.pro | 9 | ||||
-rw-r--r-- | tools/qmlmin/qmlmin.pro | 9 | ||||
-rw-r--r-- | tools/qmlplugindump/main.cpp | 125 | ||||
-rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 9 | ||||
-rw-r--r-- | tools/qmlprofiler/qmlprofiler.pro | 9 | ||||
-rw-r--r-- | tools/qmlscene/main.cpp | 9 | ||||
-rw-r--r-- | tools/qmlscene/qmlscene.pro | 9 | ||||
-rw-r--r-- | tools/qmltestrunner/qmltestrunner.pro | 9 | ||||
-rw-r--r-- | tools/qmltime/qmltime.pro | 10 |
14 files changed, 85 insertions, 151 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index d0083c0e78..3aa8af18bc 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -6,14 +6,7 @@ HEADERS += conf.h SOURCES += main.cpp RESOURCES += qml.qrc -QMAKE_TARGET_PRODUCT = qml -QMAKE_TARGET_DESCRIPTION = Utility that loads and displays QML documents - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Runtime mac { OTHER_FILES += Info.plist diff --git a/tools/qmlcachegen/qmlcachegen.pro b/tools/qmlcachegen/qmlcachegen.pro index 25afc2860d..be92ef435e 100644 --- a/tools/qmlcachegen/qmlcachegen.pro +++ b/tools/qmlcachegen/qmlcachegen.pro @@ -11,4 +11,6 @@ build_integration.path = $$[QT_HOST_DATA]/mkspecs/features prefix_build: INSTALLS += build_integration else: COPIES += build_integration +QMAKE_TARGET_DESCRIPTION = QML Cache Generator + load(qt_tool) diff --git a/tools/qmleasing/qmleasing.pro b/tools/qmleasing/qmleasing.pro index 534bc9fe98..4267ecc5ad 100644 --- a/tools/qmleasing/qmleasing.pro +++ b/tools/qmleasing/qmleasing.pro @@ -17,13 +17,6 @@ FORMS += \ pane.ui \ import.ui -QMAKE_TARGET_PRODUCT = qmleasing -QMAKE_TARGET_DESCRIPTION = QML easing curve editor - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Easing Curve Editor load(qt_app) diff --git a/tools/qmlimportscanner/qmlimportscanner.pro b/tools/qmlimportscanner/qmlimportscanner.pro index 363424f948..0b3a03abf3 100644 --- a/tools/qmlimportscanner/qmlimportscanner.pro +++ b/tools/qmlimportscanner/qmlimportscanner.pro @@ -5,13 +5,6 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII SOURCES += main.cpp -QMAKE_TARGET_PRODUCT = qmlimportscanner -QMAKE_TARGET_DESCRIPTION = Tool to scan projects for QML imports - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Import Scanner load(qt_tool) diff --git a/tools/qmljs/qmljs.pro b/tools/qmljs/qmljs.pro index 9f82f48980..c2c4cb3cc4 100644 --- a/tools/qmljs/qmljs.pro +++ b/tools/qmljs/qmljs.pro @@ -5,13 +5,6 @@ SOURCES = qmljs.cpp include($$PWD/../../src/3rdparty/masm/masm-defs.pri) -QMAKE_TARGET_PRODUCT = qmljs -QMAKE_TARGET_DESCRIPTION = QML Javascript tool - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML JavaScript Tool load(qt_tool) diff --git a/tools/qmllint/qmllint.pro b/tools/qmllint/qmllint.pro index 27af880c8c..91ab2f8afc 100644 --- a/tools/qmllint/qmllint.pro +++ b/tools/qmllint/qmllint.pro @@ -4,13 +4,6 @@ QT = core qmldevtools-private SOURCES += main.cpp -QMAKE_TARGET_PRODUCT = qmllint -QMAKE_TARGET_DESCRIPTION = QML syntax verifier - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Syntax Verifier load(qt_tool) diff --git a/tools/qmlmin/qmlmin.pro b/tools/qmlmin/qmlmin.pro index f5248e1b69..32d9e3343b 100644 --- a/tools/qmlmin/qmlmin.pro +++ b/tools/qmlmin/qmlmin.pro @@ -2,13 +2,6 @@ option(host_build) QT = core qmldevtools-private SOURCES += main.cpp -QMAKE_TARGET_PRODUCT = qmlmin -QMAKE_TARGET_DESCRIPTION = QML/JS minifier - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML/JS Minifier load(qt_tool) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index dd7ae36c5d..2b919909ac 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -144,11 +144,11 @@ void collectReachableMetaObjects(QObject *object, QSet<const QMetaObject *> *met } } -void collectReachableMetaObjects(QQmlEnginePrivate *engine, const QQmlType *ty, QSet<const QMetaObject *> *metas) +void collectReachableMetaObjects(QQmlEnginePrivate *engine, const QQmlType &ty, QSet<const QMetaObject *> *metas) { - collectReachableMetaObjects(ty->metaObject(), metas, ty->isExtendedType()); - if (ty->attachedPropertiesType(engine)) - collectReachableMetaObjects(ty->attachedPropertiesType(engine), metas); + collectReachableMetaObjects(ty.metaObject(), metas, ty.isExtendedType()); + if (ty.attachedPropertiesType(engine)) + collectReachableMetaObjects(ty.attachedPropertiesType(engine), metas); } /* We want to add the MetaObject for 'Qt' to the list, this is a @@ -164,11 +164,11 @@ public: To do this, we need to find the QQmlTypes associated with this QMetaObject. */ -static QHash<QByteArray, QSet<const QQmlType *> > qmlTypesByCppName; +static QHash<QByteArray, QSet<QQmlType> > qmlTypesByCppName; /* A composite type is completely specified by name, major version and minor version. */ -static QMap<QString, QSet<const QQmlType *> > qmlTypesByCompositeName; +static QMap<QString, QSet<QQmlType> > qmlTypesByCompositeName; static QHash<QByteArray, QByteArray> cppToId; @@ -213,12 +213,12 @@ QByteArray convertToId(const QMetaObject *mo) // Collect all metaobjects for types registered with qmlRegisterType() without parameters void collectReachableMetaObjectsWithoutQmlName(QQmlEnginePrivate *engine, QSet<const QMetaObject *>& metas ) { const auto qmlAllTypes = QQmlMetaType::qmlAllTypes(); - for (const QQmlType *ty : qmlAllTypes) { - if ( ! metas.contains(ty->metaObject()) ) { - if (!ty->isComposite()) { + for (const QQmlType &ty : qmlAllTypes) { + if ( ! metas.contains(ty.metaObject()) ) { + if (!ty.isComposite()) { collectReachableMetaObjects(engine, ty, &metas); } else { - qmlTypesByCompositeName[ty->elementName()].insert(ty); + qmlTypesByCompositeName[ty.elementName()].insert(ty); } } } @@ -227,25 +227,25 @@ void collectReachableMetaObjectsWithoutQmlName(QQmlEnginePrivate *engine, QSet<c QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, QSet<const QMetaObject *> &noncreatables, QSet<const QMetaObject *> &singletons, - const QList<QQmlType *> &skip = QList<QQmlType *>()) + const QList<QQmlType> &skip = QList<QQmlType>()) { QSet<const QMetaObject *> metas; metas.insert(FriendlyQObject::qtMeta()); QHash<QByteArray, QSet<QByteArray> > extensions; const auto qmlTypes = QQmlMetaType::qmlTypes(); - for (const QQmlType *ty : qmlTypes) { - if (!ty->isCreatable()) - noncreatables.insert(ty->metaObject()); - if (ty->isSingleton()) - singletons.insert(ty->metaObject()); - if (!ty->isComposite()) { - qmlTypesByCppName[ty->metaObject()->className()].insert(ty); - if (ty->isExtendedType()) - extensions[ty->typeName()].insert(ty->metaObject()->className()); + for (const QQmlType &ty : qmlTypes) { + if (!ty.isCreatable()) + noncreatables.insert(ty.metaObject()); + if (ty.isSingleton()) + singletons.insert(ty.metaObject()); + if (!ty.isComposite()) { + qmlTypesByCppName[ty.metaObject()->className()].insert(ty); + if (ty.isExtendedType()) + extensions[ty.typeName()].insert(ty.metaObject()->className()); collectReachableMetaObjects(QQmlEnginePrivate::get(engine), ty, &metas); } else { - qmlTypesByCompositeName[ty->elementName()].insert(ty); + qmlTypesByCompositeName[ty.elementName()].insert(ty); } } @@ -254,21 +254,21 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, // Example: QDeclarativeGraphicsWidget overrides the QtQuick/QGraphicsWidget export // of QGraphicsWidget. for (auto it = extensions.cbegin(), end = extensions.cend(); it != end; ++it) { - QSet<const QQmlType *> baseExports = qmlTypesByCppName.value(it.key()); + QSet<QQmlType> baseExports = qmlTypesByCppName.value(it.key()); const QSet<QByteArray> extensionCppNames = it.value(); for (const QByteArray &extensionCppName : extensionCppNames) { - const QSet<const QQmlType *> extensionExports = qmlTypesByCppName.value(extensionCppName); + const QSet<QQmlType> extensionExports = qmlTypesByCppName.value(extensionCppName); // remove extension exports from base imports // unfortunately the QQmlType pointers don't match, so can't use QSet::subtract - QSet<const QQmlType *> newBaseExports; - for (const QQmlType *baseExport : qAsConst(baseExports)) { + QSet<QQmlType> newBaseExports; + for (const QQmlType &baseExport : qAsConst(baseExports)) { bool match = false; - for (const QQmlType *extensionExport : extensionExports) { - if (baseExport->qmlTypeName() == extensionExport->qmlTypeName() - && baseExport->majorVersion() == extensionExport->majorVersion() - && baseExport->minorVersion() == extensionExport->minorVersion()) { + for (const QQmlType &extensionExport : extensionExports) { + if (baseExport.qmlTypeName() == extensionExport.qmlTypeName() + && baseExport.majorVersion() == extensionExport.majorVersion() + && baseExport.minorVersion() == extensionExport.minorVersion()) { match = true; break; } @@ -284,17 +284,17 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, if (creatable) { // find even more QMetaObjects by instantiating QML types and running // over the instances - for (QQmlType *ty : qmlTypes) { + for (const QQmlType &ty : qmlTypes) { if (skip.contains(ty)) continue; - if (ty->isExtendedType()) + if (ty.isExtendedType()) continue; - if (!ty->isCreatable()) + if (!ty.isCreatable()) continue; - if (ty->typeName() == "QQmlComponent") + if (ty.typeName() == "QQmlComponent") continue; - QString tyName = ty->qmlTypeName(); + QString tyName = ty.qmlTypeName(); tyName = tyName.mid(tyName.lastIndexOf(QLatin1Char('/')) + 1); if (tyName.isEmpty()) continue; @@ -302,11 +302,11 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, inObjectInstantiation = tyName; QObject *object = 0; - if (ty->isSingleton()) { - QQmlType::SingletonInstanceInfo *siinfo = ty->singletonInstanceInfo(); + if (ty.isSingleton()) { + QQmlType::SingletonInstanceInfo *siinfo = ty.singletonInstanceInfo(); if (!siinfo) { std::cerr << "Internal error, " << qPrintable(tyName) - << "(" << qPrintable( QString::fromUtf8(ty->typeName()) ) << ")" + << "(" << qPrintable( QString::fromUtf8(ty.typeName()) ) << ")" << " is singleton, but has no singletonInstanceInfo" << std::endl; continue; } @@ -324,8 +324,8 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, } else { if (verbose) std::cerr << "Trying to create object " << qPrintable( tyName ) - << " (" << qPrintable( QString::fromUtf8(ty->typeName()) ) << ")" << std::endl; - object = ty->create(); + << " (" << qPrintable( QString::fromUtf8(ty.typeName()) ) << ")" << std::endl; + object = ty.create(); } inObjectInstantiation.clear(); @@ -333,7 +333,7 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, if (object) { if (verbose) std::cerr << "Got " << qPrintable( tyName ) - << " (" << qPrintable( QString::fromUtf8(ty->typeName()) ) << ")" << std::endl; + << " (" << qPrintable( QString::fromUtf8(ty.typeName()) ) << ")" << std::endl; collectReachableMetaObjects(object, &metas); object->deleteLater(); } else { @@ -476,17 +476,17 @@ public: return prototypeName; } - void dumpComposite(QQmlEngine *engine, const QSet<const QQmlType *> &compositeType, QSet<QByteArray> &defaultReachableNames) + void dumpComposite(QQmlEngine *engine, const QSet<QQmlType> &compositeType, QSet<QByteArray> &defaultReachableNames) { - for (const QQmlType *type : compositeType) + for (const QQmlType &type : compositeType) dumpCompositeItem(engine, type, defaultReachableNames); } - void dumpCompositeItem(QQmlEngine *engine, const QQmlType *compositeType, QSet<QByteArray> &defaultReachableNames) + void dumpCompositeItem(QQmlEngine *engine, const QQmlType &compositeType, QSet<QByteArray> &defaultReachableNames) { - QQmlComponent e(engine, compositeType->sourceUrl()); + QQmlComponent e(engine, compositeType.sourceUrl()); if (!e.isReady()) { - std::cerr << "WARNING: skipping module " << compositeType->elementName().toStdString() + std::cerr << "WARNING: skipping module " << compositeType.elementName().toStdString() << std::endl << e.errorString().toStdString() << std::endl; return; } @@ -507,14 +507,14 @@ public: &objectsToMerge); qml->writeScriptBinding(QLatin1String("prototype"), enquote(prototypeName)); - QString qmlTyName = compositeType->qmlTypeName(); - const QString exportString = getExportString(qmlTyName, compositeType->majorVersion(), compositeType->minorVersion()); + QString qmlTyName = compositeType.qmlTypeName(); + const QString exportString = getExportString(qmlTyName, compositeType.majorVersion(), compositeType.minorVersion()); qml->writeScriptBinding(QLatin1String("name"), exportString); qml->writeArrayBinding(QLatin1String("exports"), QStringList() << exportString); - qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), QStringList() << QString::number(compositeType->minorVersion())); + qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), QStringList() << QString::number(compositeType.minorVersion())); qml->writeBooleanBinding(QLatin1String("isComposite"), true); - if (compositeType->isSingleton()) { + if (compositeType.isSingleton()) { qml->writeBooleanBinding(QLatin1String("isCreatable"), false); qml->writeBooleanBinding(QLatin1String("isSingleton"), true); } @@ -551,12 +551,12 @@ public: if (meta->superClass()) qml->writeScriptBinding(QLatin1String("prototype"), enquote(convertToId(meta->superClass()))); - const QSet<const QQmlType *> qmlTypes = qmlTypesByCppName.value(meta->className()); + const QSet<QQmlType> qmlTypes = qmlTypesByCppName.value(meta->className()); if (!qmlTypes.isEmpty()) { - QHash<QString, const QQmlType *> exports; + QHash<QString, QQmlType> exports; - for (const QQmlType *qmlTy : qmlTypes) { - const QString exportString = getExportString(qmlTy->qmlTypeName(), qmlTy->majorVersion(), qmlTy->minorVersion()); + for (const QQmlType &qmlTy : qmlTypes) { + const QString exportString = getExportString(qmlTy.qmlTypeName(), qmlTy.majorVersion(), qmlTy.minorVersion()); exports.insert(exportString, qmlTy); } @@ -574,12 +574,12 @@ public: // write meta object revisions QStringList metaObjectRevisions; for (const QString &exportString : qAsConst(exportStrings)) { - int metaObjectRevision = exports[exportString]->metaObjectRevision(); + int metaObjectRevision = exports[exportString].metaObjectRevision(); metaObjectRevisions += QString::number(metaObjectRevision); } qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), metaObjectRevisions); - if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType(engine)) { + if (const QMetaObject *attachedType = (*qmlTypes.begin()).attachedPropertiesType(engine)) { // Can happen when a type is registered that returns itself as attachedPropertiesType() // because there is no creatable type to attach to. if (attachedType != meta) { @@ -1009,6 +1009,7 @@ int main(int argc, char *argv[]) ? new QApplication(argc, argv) : new QGuiApplication(argc, argv)); #else + Q_UNUSED(useQApplication); QScopedPointer<QCoreApplication> app(new QGuiApplication(argc, argv)); #endif // QT_WIDGETS_LIB @@ -1185,7 +1186,7 @@ int main(int argc, char *argv[]) QSet<const QMetaObject *> uncreatableMetas; QSet<const QMetaObject *> singletonMetas; QSet<const QMetaObject *> defaultReachable = collectReachableMetaObjects(&engine, uncreatableMetas, singletonMetas); - QList<QQmlType *> defaultTypes = QQmlMetaType::qmlTypes(); + QList<QQmlType> defaultTypes = QQmlMetaType::qmlTypes(); // add some otherwise unreachable QMetaObjects defaultReachable.insert(&QQuickMouseEvent::staticMetaObject); @@ -1226,16 +1227,16 @@ int main(int argc, char *argv[]) } else { // find a valid QtQuick import QByteArray importCode; - QQmlType *qtObjectType = QQmlMetaType::qmlType(&QObject::staticMetaObject); - if (!qtObjectType) { + QQmlType qtObjectType = QQmlMetaType::qmlType(&QObject::staticMetaObject); + if (!qtObjectType.isValid()) { std::cerr << "Could not find QtObject type" << std::endl; importCode = qtQmlImportString.toUtf8(); } else { - QString module = qtObjectType->qmlTypeName(); + QString module = qtObjectType.qmlTypeName(); module = module.mid(0, module.lastIndexOf(QLatin1Char('/'))); importCode = QString("import %1 %2.%3").arg(module, - QString::number(qtObjectType->majorVersion()), - QString::number(qtObjectType->minorVersion())).toUtf8(); + QString::number(qtObjectType.majorVersion()), + QString::number(qtObjectType.minorVersion())).toUtf8(); } // avoid importing dependencies? for (const QString &moduleToImport : qAsConst(dependencies)) { @@ -1324,7 +1325,7 @@ int main(int argc, char *argv[]) dumper.dump(QQmlEnginePrivate::get(&engine), meta, uncreatableMetas.contains(meta), singletonMetas.contains(meta)); } - QMap<QString, QSet<const QQmlType *> >::const_iterator iter = qmlTypesByCompositeName.constBegin(); + QMap<QString, QSet<QQmlType> >::const_iterator iter = qmlTypesByCompositeName.constBegin(); for (; iter != qmlTypesByCompositeName.constEnd(); ++iter) dumper.dumpComposite(&engine, iter.value(), defaultReachableNames); diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 2749ec943f..62b08e9334 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -22,13 +22,6 @@ macx { CONFIG -= app_bundle } -QMAKE_TARGET_PRODUCT = qmlplugindump -QMAKE_TARGET_DESCRIPTION = QML plugin dump tool - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Plugin Metadata Dumper load(qt_tool) diff --git a/tools/qmlprofiler/qmlprofiler.pro b/tools/qmlprofiler/qmlprofiler.pro index b5bb1dcc46..a2522e9267 100644 --- a/tools/qmlprofiler/qmlprofiler.pro +++ b/tools/qmlprofiler/qmlprofiler.pro @@ -14,13 +14,6 @@ HEADERS += \ qmlprofilerdata.h \ qmlprofilerclient.h -QMAKE_TARGET_PRODUCT = qmlprofiler -QMAKE_TARGET_DESCRIPTION = QML profiler - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Profiler load(qt_tool) diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 6ce676456c..f411c6becc 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -156,6 +156,7 @@ struct Options , quitImmediately(false) , resizeViewToRootItem(false) , multisample(false) + , coreProfile(false) , verbose(false) , applicationType(DefaultQmlApplicationType) { @@ -176,6 +177,7 @@ struct Options bool quitImmediately; bool resizeViewToRootItem; bool multisample; + bool coreProfile; bool verbose; QVector<Qt::ApplicationAttribute> applicationAttributes; QString translationFile; @@ -359,6 +361,7 @@ static void usage() puts(" --fullscreen ..................... Run fullscreen"); puts(" --transparent .................... Make the window transparent"); puts(" --multisample .................... Enable multisampling (OpenGL anti-aliasing)"); + puts(" --core-profile ................... Request a core profile OpenGL context"); puts(" --no-version-detection ........... Do not try to detect the version of the .qml file"); puts(" --slow-animations ................ Run all animations in slow motion"); puts(" --resize-to-root ................. Resize the window to the size of the root item"); @@ -523,6 +526,8 @@ int main(int argc, char ** argv) options.resizeViewToRootItem = true; else if (lowerArgument == QLatin1String("--multisample")) options.multisample = true; + else if (lowerArgument == QLatin1String("--core-profile")) + options.coreProfile = true; else if (lowerArgument == QLatin1String("--verbose")) options.verbose = true; else if (lowerArgument == QLatin1String("-i") && i + 1 < size) @@ -641,6 +646,10 @@ int main(int argc, char ** argv) window->setColor(QColor(Qt::transparent)); window->setFlags(Qt::FramelessWindowHint); } + if (options.coreProfile) { + surfaceFormat.setVersion(4, 1); + surfaceFormat.setProfile(QSurfaceFormat::CoreProfile); + } window->setFormat(surfaceFormat); if (window->flags() == Qt::Window) // Fix window flags unless set by QML. diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index ec73f1871a..6a7df90ccc 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -7,13 +7,6 @@ SOURCES += main.cpp DEFINES += QML_RUNTIME_TESTING !contains(QT_CONFIG, no-qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING -QMAKE_TARGET_PRODUCT = qmlscene -QMAKE_TARGET_DESCRIPTION = Utility that loads and displays QML documents - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Scene Viewer load(qt_tool) diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro index 505537480c..47b9637199 100644 --- a/tools/qmltestrunner/qmltestrunner.pro +++ b/tools/qmltestrunner/qmltestrunner.pro @@ -3,13 +3,6 @@ SOURCES += main.cpp QT += qml qmltest CONFIG += no_import_scan -QMAKE_TARGET_PRODUCT = qmltestrunner -QMAKE_TARGET_DESCRIPTION = QML test runner - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Test Runner load(qt_tool) diff --git a/tools/qmltime/qmltime.pro b/tools/qmltime/qmltime.pro index ec1bcb5a03..04a5fd5957 100644 --- a/tools/qmltime/qmltime.pro +++ b/tools/qmltime/qmltime.pro @@ -4,13 +4,5 @@ QT += qml quick QT += quick-private macx:CONFIG -= app_bundle -QMAKE_TARGET_PRODUCT = qmltime -QMAKE_TARGET_DESCRIPTION = Tool for benchmarking the instantiation of a QML component - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} - +QMAKE_TARGET_DESCRIPTION = QML Time SOURCES += qmltime.cpp |