summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-08-02 14:01:40 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-04 08:15:22 +0200
commit8f58c7c6ede00d3c39f86c77be9b4b08b723b30e (patch)
treec1642ac9e6af290d9b0c1ff29a426035eaebaa5d
parente185f343e468da482d50f4dfbd26cf217545a8e7 (diff)
downloadqtbase-8f58c7c6ede00d3c39f86c77be9b4b08b723b30e.tar.gz
s/QT_PRIVATE/QT_FOR_PRIVATE/
QT_PRIVATE is meant to be for something different. only jsondb uses that so far. as it has little activity, i feel free to break it temporarily. Change-Id: Ifaa054af7234594ee534120c99506b76aebbf59f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--mkspecs/features/qt_module_config.prf10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 5da4ca0f12..545bc101db 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -51,9 +51,9 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri
!build_pass {
# Create a module .pri file
- !isEmpty(QT_PRIVATE) {
- contains(QT_PRIVATE, .*-private$):error("QT_PRIVATE may not contain *-private.")
- module_privdep = "QT.$${MODULE}.private_depends = $$QT_PRIVATE"
+ !isEmpty(QT_FOR_PRIVATE) {
+ contains(QT_FOR_PRIVATE, .*-private$):error("QT_FOR_PRIVATE may not contain *-private.")
+ module_privdep = "QT.$${MODULE}.private_depends = $$QT_FOR_PRIVATE"
} else {
module_privdep =
}
@@ -126,8 +126,8 @@ if(win32|mac):!macx-xcode {
linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
-QT += $$QT_PRIVATE
-unset(QT_PRIVATE)
+QT += $$QT_FOR_PRIVATE
+unset(QT_FOR_PRIVATE)
!build_pass:!internal_module:CONFIG += create_cmake