summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-12 11:14:48 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-25 12:39:11 +0200
commit4f5c8954cccbeb72700ec0861094a73134361818 (patch)
tree1e092bf19b6a9336cd46055f27ffee7dde044348
parent48baeef0766ba145d26d374561e152b40245f3b8 (diff)
downloadqtscript-4f5c8954cccbeb72700ec0861094a73134361818.tar.gz
auto-generate module pris
Change-Id: I060145658caaa4b4d39c323c6004e594ff44f98f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--modules/qt_script.pri17
-rw-r--r--modules/qt_scripttools.pri17
-rw-r--r--src/script/script.pro1
-rw-r--r--src/scripttools/scripttools.pro6
-rw-r--r--sync.profile4
5 files changed, 4 insertions, 41 deletions
diff --git a/modules/qt_script.pri b/modules/qt_script.pri
deleted file mode 100644
index 43fab86..0000000
--- a/modules/qt_script.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.script.VERSION = 5.0.0
-QT.script.MAJOR_VERSION = 5
-QT.script.MINOR_VERSION = 0
-QT.script.PATCH_VERSION = 0
-
-QT.script.name = QtScript
-QT.script.bins = $$QT_MODULE_BIN_BASE
-QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript
-QT.script.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScript/$$QT.script.VERSION
-QT.script.sources = $$QT_MODULE_BASE/src/script
-QT.script.libs = $$QT_MODULE_LIB_BASE
-QT.script.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.script.imports = $$QT_MODULE_IMPORT_BASE
-QT.script.depends = core
-QT.script.DEFINES = QT_SCRIPT_LIB
-
-QT_CONFIG += script
diff --git a/modules/qt_scripttools.pri b/modules/qt_scripttools.pri
deleted file mode 100644
index 32a6c36..0000000
--- a/modules/qt_scripttools.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.scripttools.VERSION = 5.0.0
-QT.scripttools.MAJOR_VERSION = 5
-QT.scripttools.MINOR_VERSION = 0
-QT.scripttools.PATCH_VERSION = 0
-
-QT.scripttools.name = QtScriptTools
-QT.scripttools.bins = $$QT_MODULE_BIN_BASE
-QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScriptTools
-QT.scripttools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools/$$QT.scripttools.VERSION
-QT.scripttools.sources = $$QT_MODULE_BASE/src/scripttools
-QT.scripttools.libs = $$QT_MODULE_LIB_BASE
-QT.scripttools.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.scripttools.imports = $$QT_MODULE_IMPORT_BASE
-QT.scripttools.depends = core
-QT.scripttools.DEFINES = QT_SCRIPTTOOLS_LIB
-
-QT_CONFIG += scripttools
diff --git a/src/script/script.pro b/src/script/script.pro
index a9dac69..f534b57 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -5,7 +5,6 @@ QPRO_PWD = $$PWD
QT = core-private
CONFIG += module
-MODULE_PRI = ../../modules/qt_script.pri
DEFINES += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror WTF=QTWTF
DEFINES += QT_BUILD_SCRIPT_LIB
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index 4384ed4..d2f61ee 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -2,10 +2,9 @@ load(qt_module)
TARGET = QtScriptTools
QPRO_PWD = $$PWD
-QT = core-private gui widgets widgets-private script
+QT = core-private
CONFIG += module
-MODULE_PRI = ../../modules/qt_scripttools.pri
DEFINES += QT_BUILD_SCRIPTTOOLS_LIB
DEFINES += QT_NO_USING_NAMESPACE
@@ -17,6 +16,9 @@ load(qt_module_config)
HEADERS += qtscripttoolsversion.h
+# private dependencies
+QT += gui widgets-private script
+
include(debugging/debugging.pri)
symbian:TARGET.UID3=0x2001E625
diff --git a/sync.profile b/sync.profile
index c17ef56..f4cb26a 100644
--- a/sync.profile
+++ b/sync.profile
@@ -13,10 +13,6 @@
"gui" => "#include <QtGui/QtGui>\n",
"script" => "#include <QtScript/QtScript>\n",
);
-%modulepris = (
- "QtScript" => "$basedir/modules/qt_script.pri",
- "QtScriptTools" => "$basedir/modules/qt_scripttools.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: