summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/qt_qt3dquick.pri30
-rw-r--r--pkg.pri2
-rw-r--r--qt3d.pro (renamed from qtquick3d.pro)0
-rw-r--r--src/imports/shapes/shapes.pro4
-rw-r--r--src/imports/threed/threed.pro4
-rw-r--r--src/quick3d/quick3d.pro2
-rw-r--r--sync.profile1
-rw-r--r--tests/benchmarks/matrix_properties/matrix_properties.pro2
-rw-r--r--tests/manual/animations/animations.pro2
-rw-r--r--tests/manual/displaymodel/displaymodel.pro2
-rw-r--r--tests/manual/model3ds/model3ds.pro2
-rw-r--r--tests/manual/navigation1/navigation1.pro2
-rw-r--r--tests/manual/qrc/qrc.pro2
-rw-r--r--tests/manual/rotation/rotation.pro2
-rw-r--r--tests/manual/scaling/scaling.pro2
-rw-r--r--tests/manual/submesh/submesh.pro2
-rw-r--r--tests/manual/transformations/transformations.pro2
-rw-r--r--tests/manual/translation/translation.pro2
-rw-r--r--tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro2
-rw-r--r--tutorials/quick3d/teapot_qml/teapot_qml.pro2
20 files changed, 35 insertions, 34 deletions
diff --git a/modules/qt_qt3dquick.pri b/modules/qt_qt3dquick.pri
index 32fd7e5fb..c7155e9b7 100644
--- a/modules/qt_qt3dquick.pri
+++ b/modules/qt_qt3dquick.pri
@@ -1,17 +1,17 @@
-QT.quick3d.VERSION = 5.0.0
-QT.quick3d.MAJOR_VERSION = 5
-QT.quick3d.MINOR_VERSION = 0
-QT.quick3d.PATCH_VERSION = 0
+QT.qt3dquick.VERSION = 5.0.0
+QT.qt3dquick.MAJOR_VERSION = 5
+QT.qt3dquick.MINOR_VERSION = 0
+QT.qt3dquick.PATCH_VERSION = 0
-QT.quick3d.name = Qt3DQuick
-QT.quick3d.bins = $$QT_MODULE_BIN_BASE
-QT.quick3d.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3DQuick
-QT.quick3d.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSensors/$$QT.quick3d.VERSION
-QT.quick3d.sources = $$QT_MODULE_BASE/src/quick3d
-QT.quick3d.libs = $$QT_MODULE_LIB_BASE
-QT.quick3d.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.quick3d.imports = $$QT_MODULE_IMPORT_BASE
-QT.quick3d.depends = gui opengl declarative network
-QT.quick3d.DEFINES = QT_QT3DQUICK_LIB
+QT.qt3dquick.name = Qt3DQuick
+QT.qt3dquick.bins = $$QT_MODULE_BIN_BASE
+QT.qt3dquick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3DQuick
+QT.qt3dquick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSensors/$$QT.quick3d.VERSION
+QT.qt3dquick.sources = $$QT_MODULE_BASE/src/quick3d
+QT.qt3dquick.libs = $$QT_MODULE_LIB_BASE
+QT.qt3dquick.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.qt3dquick.imports = $$QT_MODULE_IMPORT_BASE
+QT.qt3dquick.depends = gui opengl declarative quick network
+QT.qt3dquick.DEFINES = QT_QT3DQUICK_LIB
-QT_CONFIG += quick3d
+QT_CONFIG += qt3dquick
diff --git a/pkg.pri b/pkg.pri
index 78e39f6e6..c7ee60412 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -41,7 +41,7 @@ qt3dquick_deploy_pkg {
}
INCLUDEPATH += ../../../include/Qt3DQuick
}
- QT += declarative opengl
+ QT += declarative quick opengl
maemo: icons.files = icon-l-qtquick3d.png
} else {
diff --git a/qtquick3d.pro b/qt3d.pro
index 57dfedcb0..57dfedcb0 100644
--- a/qtquick3d.pro
+++ b/qt3d.pro
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index 08d8fecdd..db35548ca 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -2,9 +2,9 @@ TEMPLATE = lib
TARGET = qshapesqmlplugin
CONFIG += qt plugin
-QT += declarative qt3d quick3d
+QT += declarative quick qt3d qt3dquick
-DESTDIR = $$QT.quick3d.imports/Qt3D/Shapes
+DESTDIR = $$QT.qt3dquick.imports/Qt3D/Shapes
target.path = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
INSTALLS += target
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index d7b22eb10..d444ec1d6 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -2,9 +2,9 @@ TEMPLATE = lib
TARGET = qthreedqmlplugin
CONFIG += qt plugin
-QT += widgets opengl declarative qt3d quick3d
+QT += widgets opengl declarative quick qt3d qt3dquick
-DESTDIR = $$QT.quick3d.imports/Qt3D
+DESTDIR = $$QT.qt3dquick.imports/Qt3D
target.path = $$[QT_INSTALL_IMPORTS]/Qt3D
INSTALLS += target
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index 99a476af6..fea5758e0 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -1,7 +1,7 @@
load(qt_module)
TARGET = Qt3DQuick
-MODULE = quick3d
+MODULE = qt3dquick
QT = core gui network declarative quick qt3d
CONFIG += module
diff --git a/sync.profile b/sync.profile
index 700673bf4..bac55a69d 100644
--- a/sync.profile
+++ b/sync.profile
@@ -12,6 +12,7 @@
"gui" => "#include <QtGui/QtGui>\n",
"opengl" => "#include <QtOpenGL/QtOpenGL>\n",
"declarative" => "#include <QtDeclarative/QDeclarative>\n",
+ "quick" => "#include <QtQuick/QQuick>\n",
"network" => "#include <QtNetwork/QtNetwork>\n"
);
%modulepris = (
diff --git a/tests/benchmarks/matrix_properties/matrix_properties.pro b/tests/benchmarks/matrix_properties/matrix_properties.pro
index 10df68be1..dca3c9ba7 100644
--- a/tests/benchmarks/matrix_properties/matrix_properties.pro
+++ b/tests/benchmarks/matrix_properties/matrix_properties.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = tst_matrix_properties
-QT += declarative testlib
+QT += declarative quick testlib
macx:CONFIG -= app_bundle
SOURCES += tst_matrix_properties.cpp
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index 1fd243f9a..74065399f 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_animations
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index 49b36b2c8..3bda8dccc 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_displaymodel
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro
index add175723..7c352d7d0 100644
--- a/tests/manual/model3ds/model3ds.pro
+++ b/tests/manual/model3ds/model3ds.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_model3ds
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro
index 025937a8d..63e690143 100644
--- a/tests/manual/navigation1/navigation1.pro
+++ b/tests/manual/navigation1/navigation1.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_navigation1
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro
index eb566e43b..401b41ecb 100644
--- a/tests/manual/qrc/qrc.pro
+++ b/tests/manual/qrc/qrc.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_qrc
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index e154ee1d5..62a93fd30 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_rotation
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index 49688fe4f..045de2911 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_scaling
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index c02890240..490531488 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_submesh
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index b68bdc15e..f3b0fe04c 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_transformations
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index eb86409d1..e2b3f1fb7 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = tst_translation
CONFIG += qt warn_on
-QT += quick3d
+QT += qt3dquick
SOURCES += main.cpp
diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
index c242a2e48..7db5ca199 100644
--- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
+++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = teapot_bounce_qml
CONFIG += qt warn_on
-QT += declarative quick3d
+QT += declarative quick qt3dquick
SOURCES += main.cpp
HEADERS += ../qmlres.h
diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.pro b/tutorials/quick3d/teapot_qml/teapot_qml.pro
index b7afdea65..72b29256d 100644
--- a/tutorials/quick3d/teapot_qml/teapot_qml.pro
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = teapot_qml
CONFIG += qt warn_on
-QT += declarative quick3d
+QT += declarative quick qt3dquick
SOURCES += main.cpp
HEADERS += ../qmlres.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 19:51:07 +0000