summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/qt_qml.pri17
-rw-r--r--modules/qt_qmldevtools.pri19
-rw-r--r--modules/qt_qmltest.pri17
-rw-r--r--modules/qt_quick.pri17
-rw-r--r--modules/qt_quickparticles.pri17
-rw-r--r--src/particles/particles.pro1
-rw-r--r--src/qml/qml.pro2
-rw-r--r--src/qmldevtools/qmldevtools.pro2
-rw-r--r--src/qmltest/qmltest.pro1
-rw-r--r--src/quick/quick.pro1
-rw-r--r--sync.profile7
11 files changed, 1 insertions, 100 deletions
diff --git a/modules/qt_qml.pri b/modules/qt_qml.pri
deleted file mode 100644
index 3dc3acac40..0000000000
--- a/modules/qt_qml.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.qml.VERSION = 5.0.0
-QT.qml.MAJOR_VERSION = 5
-QT.qml.MINOR_VERSION = 0
-QT.qml.PATCH_VERSION = 0
-
-QT.qml.name = QtQml
-QT.qml.bins = $$QT_MODULE_BIN_BASE
-QT.qml.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQml
-QT.qml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION
-QT.qml.sources = $$QT_MODULE_BASE/src/qml
-QT.qml.libs = $$QT_MODULE_LIB_BASE
-QT.qml.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qml.imports = $$QT_MODULE_IMPORT_BASE
-QT.qml.depends = network
-QT.qml.DEFINES = QT_QML_LIB QQmlImageProvider=QQuickImageProvider
-
-QT_CONFIG += qml
diff --git a/modules/qt_qmldevtools.pri b/modules/qt_qmldevtools.pri
deleted file mode 100644
index 7365f13404..0000000000
--- a/modules/qt_qmldevtools.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-QT.qmldevtools.VERSION = 5.0.0
-QT.qmldevtools.MAJOR_VERSION = 5
-QT.qmldevtools.MINOR_VERSION = 0
-QT.qmldevtools.PATCH_VERSION = 0
-
-QT.qmldevtools.name = QtQmlDevTools
-QT.qmldevtools.bins = $$QT_MODULE_BIN_BASE
-QT.qmldevtools.includes = $$QT_MODULE_INCLUDE_BASE/QtQmlDevTools
-QT.qmldevtools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQmlDevTools/$$QT.qmldevtools.VERSION
-QT.qmldevtools.sources = $$QT_MODULE_BASE/src/qmldevtools
-QT.qmldevtools.libs = $$QT_MODULE_LIB_BASE
-QT.qmldevtools.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qmldevtools.imports = $$QT_MODULE_IMPORT_BASE
-QT.qmldevtools.depends = core
-QT.qmldevtools.module_config = staticlib
-QT.qmldevtools.DEFINES = QT_QMLDEVTOOLS_LIB
-
-QT_CONFIG += qmldevtools
-
diff --git a/modules/qt_qmltest.pri b/modules/qt_qmltest.pri
deleted file mode 100644
index e3d747f700..0000000000
--- a/modules/qt_qmltest.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.qmltest.VERSION = 5.0.0
-QT.qmltest.MAJOR_VERSION = 5
-QT.qmltest.MINOR_VERSION = 0
-QT.qmltest.PATCH_VERSION = 0
-
-QT.qmltest.name = QtQuickTest
-QT.qmltest.bins = $$QT_MODULE_BIN_BASE
-QT.qmltest.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuickTest
-QT.qmltest.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuickTest/$$QT.qmltest.VERSION
-QT.qmltest.sources = $$QT_MODULE_BASE/src/qmltest
-QT.qmltest.libs = $$QT_MODULE_LIB_BASE
-QT.qmltest.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qmltest.imports = $$QT_MODULE_IMPORT_BASE
-QT.qmltest.depends = qml testlib
-QT.qmltest.DEFINES = QT_QMLTEST_LIB
-
-QT_CONFIG += qmltest
diff --git a/modules/qt_quick.pri b/modules/qt_quick.pri
deleted file mode 100644
index b1fc754cd8..0000000000
--- a/modules/qt_quick.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.quick.VERSION = 5.0.0
-QT.quick.MAJOR_VERSION = 5
-QT.quick.MINOR_VERSION = 0
-QT.quick.PATCH_VERSION = 0
-
-QT.quick.name = QtQuick
-QT.quick.bins = $$QT_MODULE_BIN_BASE
-QT.quick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuick
-QT.quick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick/$$QT.quick.VERSION
-QT.quick.sources = $$QT_MODULE_BASE/src/quick
-QT.quick.libs = $$QT_MODULE_LIB_BASE
-QT.quick.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.quick.imports = $$QT_MODULE_IMPORT_BASE
-QT.quick.depends = qml gui
-QT.quick.DEFINES = QT_QUICK_LIB
-
-QT_CONFIG += quick
diff --git a/modules/qt_quickparticles.pri b/modules/qt_quickparticles.pri
deleted file mode 100644
index ae1064aca8..0000000000
--- a/modules/qt_quickparticles.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.quickparticles.VERSION = 5.0.0
-QT.quickparticles.MAJOR_VERSION = 5
-QT.quickparticles.MINOR_VERSION = 0
-QT.quickparticles.PATCH_VERSION = 0
-
-QT.quickparticles.name = QtQuickParticles
-QT.quickparticles.bins = $$QT_MODULE_BIN_BASE
-QT.quickparticles.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuickParticles
-QT.quickparticles.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuickParticles/$$QT.quickparticles.VERSION
-QT.quickparticles.sources = $$QT_MODULE_BASE/src/particles
-QT.quickparticles.libs = $$QT_MODULE_LIB_BASE
-QT.quickparticles.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.quickparticles.imports = $$QT_MODULE_IMPORT_BASE
-QT.quickparticles.depends = qml quick
-QT.quickparticles.DEFINES = QT_QUICKPARTICLES_LIB
-
-QT_CONFIG += quickparticles
diff --git a/src/particles/particles.pro b/src/particles/particles.pro
index 4a3b868c05..399f4d3428 100644
--- a/src/particles/particles.pro
+++ b/src/particles/particles.pro
@@ -4,7 +4,6 @@ TARGET = QtQuickParticles
CONFIG += module
CONFIG += dll warn_on
-MODULE_PRI = ../../modules/qt_quickparticles.pri
QT = core-private gui-private qml-private quick-private
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 0af39dae23..15594f1a5d 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -4,7 +4,6 @@ TARGET = QtQml
QPRO_PWD = $$PWD
CONFIG += module
-MODULE_PRI += ../../modules/qt_qml.pri
QT = core-private network
@@ -21,6 +20,7 @@ exists("qqml_enable_gcov") {
LIBS += -lgcov
}
+MODULE_DEFINES = QQmlImageProvider=QQuickImageProvider
load(qt_module_config)
# private dependencies
diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro
index 4dd21c6110..2312581acb 100644
--- a/src/qmldevtools/qmldevtools.pro
+++ b/src/qmldevtools/qmldevtools.pro
@@ -7,8 +7,6 @@ DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += module
CONFIG += staticlib
-MODULE_PRI = ../../modules/qt_qmldevtools.pri
-
DEFINES += QT_BUILD_QMLDEVTOOLS_LIB
load(qt_module_config)
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
index 3c08030c34..c0b083a388 100644
--- a/src/qmltest/qmltest.pro
+++ b/src/qmltest/qmltest.pro
@@ -5,7 +5,6 @@ QPRO_PWD = $$PWD
CONFIG += module
CONFIG += dll warn_on
-MODULE_PRI += ../../modules/qt_qmltest.pri
QT += qml testlib-private gui-private
DEFINES += QT_BUILD_QUICK_TEST_LIB QT_NO_URL_CAST_FROM_STRING
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index 7f7a0c2c18..023f9e4d69 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -4,7 +4,6 @@ TARGET = QtQuick
CONFIG += module
CONFIG += dll warn_on
-MODULE_PRI = ../../modules/qt_quick.pri
QT = core-private gui-private qml-private
diff --git a/sync.profile b/sync.profile
index d4f22c7eef..2bfe12dd07 100644
--- a/sync.profile
+++ b/sync.profile
@@ -18,13 +18,6 @@
"qml" => "#include <QtQml/QtQml>\n",
"quick" => "#include <QtQuick/QtQuick>\n",
);
-%modulepris = (
- "QtQml" => "$basedir/modules/qt_qml.pri",
- "QtQuick" => "$basedir/modules/qt_quick.pri",
- "QtQuickParticles" => "$basedir/modules/qt_quickparticles.pri",
- "QtQuickTest" => "$basedir/modules/qt_qmltest.pri",
- "QtQmlDevTools" => "$basedir/modules/qt_qmldevtools.pri",
-);
%deprecatedheaders = (
"QtQml" => {
"QQmlImageProvider" => "QtQuick/QQuickImageProvider",