diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:06:05 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-24 19:24:20 +0200 |
commit | a4628855ee95ef359e3ea66fcdb47dc03f14a9c4 (patch) | |
tree | ae5bce370724df2abfc36d8576ce873ad909076f | |
parent | ba855ba1124e2159dbe1a1639f2fb7f1ceddb1df (diff) |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
Change-Id: Ia77f205e3411d9661b4c794e1a78d4d530d27383
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
-rw-r--r-- | src/quick3d/quick3d.pro | 4 | ||||
-rw-r--r-- | src/threed/threed.pro | 4 | ||||
-rw-r--r-- | sync.profile | 11 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro index 18ca5b350..95e9e7ffb 100644 --- a/src/quick3d/quick3d.pro +++ b/src/quick3d/quick3d.pro @@ -1,8 +1,7 @@ -load(qt_module) +load(qt_build_config) TARGET = Qt3DQuick MODULE = 3dquick -CONFIG += module QT = core gui qml quick 3d load(qt_module_config) @@ -32,7 +31,6 @@ include(quick3d.pri) PUBLIC_HEADERS = $$HEADERS HEADERS += $$PRIVATE_HEADERS -DEFINES += QT_BUILD_QT3D_QUICK_LIB !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL diff --git a/src/threed/threed.pro b/src/threed/threed.pro index afb90fe10..668bf2591 100644 --- a/src/threed/threed.pro +++ b/src/threed/threed.pro @@ -1,8 +1,7 @@ -load(qt_module) +load(qt_build_config) TARGET = Qt3D MODULE = 3d -CONFIG += module QT = core-private gui-private load(qt_module_config) @@ -22,6 +21,5 @@ include(../private/private.pri) include(threed.pri) PUBLIC_HEADERS = $$HEADERS HEADERS += $$PRIVATE_HEADERS -DEFINES += QT_BUILD_QT3D_LIB !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL diff --git a/sync.profile b/sync.profile index 3da585e6e..dd654fe3b 100644 --- a/sync.profile +++ b/sync.profile @@ -4,17 +4,6 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -%classnames = ( - "qtquick3dversion.h" => "QtQuick3DVersion", -); -%mastercontent = ( - "core" => "#include <QtCore/QtCore>\n", - "gui" => "#include <QtGui/QtGui>\n", - "opengl" => "#include <QtOpenGL/QtOpenGL>\n", - "declarative" => "#include <QtQml/QtQml>\n", - "quick" => "#include <QtQuick/QQuick>\n", - "network" => "#include <QtNetwork/QtNetwork>\n" -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: |