diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 11:13:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 14:53:17 +0200 |
| commit | 747e9b69072360768f51dbc71910439a248ec510 (patch) | |
| tree | 9d68eade647032691ac20fddd2e7dcd6e38a2e73 | |
| parent | e506c968cf72dd2f06551ebc13595dbfe0180ed2 (diff) | |
auto-generate module pris
Change-Id: Ia96fa9e0ba43de4c32053699d0e9528ef308fb67
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | modules/qt_quick1.pri | 17 | ||||
| -rw-r--r-- | src/declarative/declarative.pro | 8 | ||||
| -rw-r--r-- | sync.profile | 3 |
3 files changed, 5 insertions, 23 deletions
diff --git a/modules/qt_quick1.pri b/modules/qt_quick1.pri deleted file mode 100644 index ac87630d..00000000 --- a/modules/qt_quick1.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT.quick1.VERSION = 5.0.0 -QT.quick1.MAJOR_VERSION = 5 -QT.quick1.MINOR_VERSION = 0 -QT.quick1.PATCH_VERSION = 0 - -QT.quick1.name = QtQuick1 -QT.quick1.bins = $$QT_MODULE_BIN_BASE -QT.quick1.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuick1 -QT.quick1.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick1/$$QT.quick1.VERSION -QT.quick1.sources = $$QT_MODULE_BASE/src/declarative -QT.quick1.libs = $$QT_MODULE_LIB_BASE -QT.quick1.plugins = $$QT_MODULE_PLUGIN_BASE -QT.quick1.imports = $$QT_MODULE_IMPORT_BASE/QtQuick1 -QT.quick1.depends = gui network script xmlpatterns -QT.quick1.DEFINES = QT_QTQUICK1_LIB - -QT_CONFIG += quick1 diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 0684859a..39b785a1 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -3,14 +3,16 @@ load(qt_module) TARGET = QtQuick1 QPRO_PWD = $$PWD -QT += core core-private gui gui-private widgets widgets-private script script-private network - CONFIG += module -MODULE_PRI = ../../modules/qt_quick1.pri +QT = core-private gui-private widgets-private script-private MODULE=quick1 +MODULE_IMPORT_SUFFIX = /QtQuick1 load(qt_module_config) +# private dependencies +QT += xmlpatterns + DEFINES += QT_BUILD_QUICK1_LIB QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 diff --git a/sync.profile b/sync.profile index 58d3ff8c..d6f8ac81 100644 --- a/sync.profile +++ b/sync.profile @@ -11,9 +11,6 @@ "network" => "#include <QtNetwork/QtNetwork>\n", "testlib" => "#include <QtTest/QtTest>\n", ); -%modulepris = ( - "QtQuick1" => "$basedir/modules/qt_quick1.pri", -); # 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: |