diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-11 11:54:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:40:06 +0200 |
| commit | fb36b22269b62f04c7e158412aed4348bd4a2e56 (patch) | |
| tree | ea3d86bddad56225764d3a81645819083704c1d4 /src/tools/bootstrap | |
| parent | 95b2e051f96582a0303bcfa873149ea1a2e7d299 (diff) | |
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>
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index f6f8eba82b..5ea10d0e46 100644 --- 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 8f29393be2..afb1448be2 100644 --- 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 \ |