summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-04-21 07:55:55 -0500
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-02 15:30:54 +0200
commitdf9564cee47baaaeb3580343f607d22e3b6b4445 (patch)
tree8f6632a61104de0055633b4cdaa936c26f602437
parentd9859f56f3234195c3e6f67f288df31f5918e447 (diff)
downloadqtscript-df9564cee47baaaeb3580343f607d22e3b6b4445.tar.gz
Use private headers
-rw-r--r--modules/qt_script.pri10
-rw-r--r--modules/qt_scripttools.pri10
-rw-r--r--src/script/script.pro2
-rw-r--r--src/scripttools/scripttools.pro2
4 files changed, 12 insertions, 12 deletions
diff --git a/modules/qt_script.pri b/modules/qt_script.pri
index 18c6632..5598bb0 100644
--- a/modules/qt_script.pri
+++ b/modules/qt_script.pri
@@ -1,12 +1,12 @@
-QT_SCRIPT_VERSION = $$QT_VERSION
-QT_SCRIPT_MAJOR_VERSION = $$QT_MAJOR_VERSION
-QT_SCRIPT_MINOR_VERSION = $$QT_MINOR_VERSION
-QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.script.VERSION = 4.8.0
+QT.script.MAJOR_VERSION = 4
+QT.script.MINOR_VERSION = 8
+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/private
+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
diff --git a/modules/qt_scripttools.pri b/modules/qt_scripttools.pri
index 63ae470..9b7a863 100644
--- a/modules/qt_scripttools.pri
+++ b/modules/qt_scripttools.pri
@@ -1,12 +1,12 @@
-QT_SCRIPTTOOLS_VERSION = $$QT_VERSION
-QT_SCRIPTTOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION
-QT_SCRIPTTOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
-QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.scripttools.VERSION = 4.8.0
+QT.scripttools.MAJOR_VERSION = 4
+QT.scripttools.MINOR_VERSION = 8
+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/private
+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
diff --git a/src/script/script.pro b/src/script/script.pro
index 8e9a3ab..fdf96fe 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -2,7 +2,7 @@ load(qt_module)
TARGET = QtScript
QPRO_PWD = $$PWD
-QT = core
+QT = core-private
CONFIG += module
MODULE_PRI = ../../modules/qt_script.pri
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index 1c2f1c9..93d1bd8 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -2,7 +2,7 @@ load(qt_module)
TARGET = QtScriptTools
QPRO_PWD = $$PWD
-QT = core gui script
+QT = core-private gui-private script
CONFIG += module
MODULE_PRI = ../../modules/qt_scripttools.pri