From 0ced82a8cf8472a79b08db05d441caf778ac9131 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 17 Jan 2020 10:32:49 +0100 Subject: Drop all the .2 from import directories No one is going to import version 1 of those anymore, and we will be able to export multiple major versions from the same plugin in Qt6. Change-Id: Icb2b80d349498f0e7c14d27ebba76f3d100d85e8 Reviewed-by: Fabian Kosmale Reviewed-by: Shawn Rutledge --- src/imports/models/models.pro | 2 +- src/imports/particles/particles.pro | 2 +- src/imports/qtquick2/qtquick2.pro | 2 +- src/imports/window/window.pro | 2 +- src/imports/workerscript/workerscript.pro | 2 +- src/particles/particles.pro | 2 +- src/qmlmodels/qmlmodels.pro | 2 +- src/qmlworkerscript/qmlworkerscript.pro | 2 +- src/quick/quick.pro | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/imports/models/models.pro b/src/imports/models/models.pro index 0eb9958631..ab3f4e3e15 100644 --- a/src/imports/models/models.pro +++ b/src/imports/models/models.pro @@ -1,6 +1,6 @@ CXX_MODULE = qml TARGET = modelsplugin -TARGETPATH = QtQml/Models.2 +TARGETPATH = QtQml/Models IMPORT_VERSION = 2.15 SOURCES += \ diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index d13babf30c..50e1837544 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,6 +1,6 @@ CXX_MODULE = qml TARGET = particlesplugin -TARGETPATH = QtQuick/Particles.2 +TARGETPATH = QtQuick/Particles IMPORT_VERSION = 2.15 SOURCES += \ diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro index da1772d415..f89518c054 100644 --- a/src/imports/qtquick2/qtquick2.pro +++ b/src/imports/qtquick2/qtquick2.pro @@ -1,6 +1,6 @@ CXX_MODULE = qml TARGET = qtquick2plugin -TARGETPATH = QtQuick.2 +TARGETPATH = QtQuick IMPORT_VERSION = 2.15 SOURCES += \ diff --git a/src/imports/window/window.pro b/src/imports/window/window.pro index 9c14107267..70af305937 100644 --- a/src/imports/window/window.pro +++ b/src/imports/window/window.pro @@ -1,6 +1,6 @@ CXX_MODULE = qml TARGET = windowplugin -TARGETPATH = QtQuick/Window.2 +TARGETPATH = QtQuick/Window IMPORT_VERSION = 2.15 SOURCES += \ diff --git a/src/imports/workerscript/workerscript.pro b/src/imports/workerscript/workerscript.pro index aa68d193b4..101442c3f3 100644 --- a/src/imports/workerscript/workerscript.pro +++ b/src/imports/workerscript/workerscript.pro @@ -1,6 +1,6 @@ CXX_MODULE = qml TARGET = workerscriptplugin -TARGETPATH = QtQml/WorkerScript.2 +TARGETPATH = QtQml/WorkerScript IMPORT_VERSION = 2.15 SOURCES += \ diff --git a/src/particles/particles.pro b/src/particles/particles.pro index f4efb140bd..83f6f1c83e 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -17,7 +17,7 @@ exists("qqml_enable_gcov") { include(particles.pri) QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles.2 +QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles QML_IMPORT_NAME = QtQuick.Particles IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro index 6abc5bf186..d3a7495599 100644 --- a/src/qmlmodels/qmlmodels.pro +++ b/src/qmlmodels/qmlmodels.pro @@ -64,7 +64,7 @@ qtConfig(qml-delegate-model) { } QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models.2 +QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models QML_IMPORT_NAME = QtQml.Models IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro index b091937796..a8ec68d423 100644 --- a/src/qmlworkerscript/qmlworkerscript.pro +++ b/src/qmlworkerscript/qmlworkerscript.pro @@ -18,7 +18,7 @@ SOURCES += \ include(../3rdparty/masm/masm-defs.pri) QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript.2 +QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript QML_IMPORT_NAME = QtQml.WorkerScript IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 42bb4b6ec8..03182d5875 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -52,7 +52,7 @@ INCLUDEPATH += $$PWD load(qt_module) QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick.2 +QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick QML_IMPORT_NAME = QtQuick IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes -- cgit v1.2.3