don't refer to module versions during bootstrap

once we auto-generate the pris while building their respective modules,
the versions won't be available during bootstrap yet.
however, as these are core modules, their version is locked to the global
$$QT_VERSION anyway, so just use that.

Change-Id: I092f5e7d4dfe99c03e0df71f9409cac9be9f2297
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index f6f8eba..5ea10d0 100644 (file)
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -27,8 +27,8 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH    += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtCore \
-                   $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \
-                   $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore
+                   $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \
+                   $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore
 DEPENDPATH     += $$INCLUDEPATH \
                    $$QT_SOURCE_TREE/src/corelib/global \
                    $$QT_SOURCE_TREE/src/corelib/kernel \

diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 8f29393..afb1448 100644 (file)
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -31,8 +31,8 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
             $$QT_BUILD_TREE/include/QtCore \
-            $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \
-            $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore
+            $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \
+            $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore
 
 DEPENDPATH += $$INCLUDEPATH \
               ../../corelib/global \

diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index a109867..6dc6699 100644 (file)
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -8,8 +8,8 @@ include(../moc/moc.pri)
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtDBus \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION/QtDBus \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
                    $$QT_SOURCE_TREE/src/dbus
 
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS

diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 7cefff4..aebdef5 100644 (file)
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -8,8 +8,8 @@ include(../bootstrap/bootstrap.pri)
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtDBus \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION/QtDBus \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
                    $$QT_SOURCE_TREE/src/dbus
 
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS

diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 37ec63a..9a4796c 100644 (file)
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -12,8 +12,8 @@ DEFINES += QT_NO_TRANSLATION
 INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
                $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \
                $$QT_BUILD_TREE/include/QtXml \
-               $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \
-               $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml
+               $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION \
+               $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION/QtXml
 
 DEPENDPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
               $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \