whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2012-04-11 11:54:35 +02:00
parent 95b2e051f9
commit fb36b22269
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/bootstrap/bootstrap.pri
View File

@ -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 \

4
src/tools/bootstrap/bootstrap.pro
View File

@ -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 \

4
src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
View File

@ -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

4
src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
View File

@ -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

4
src/tools/qdoc/qdoc.pro
View File

@ -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 \