diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-22 12:20:19 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:14:25 +0000 |
| commit | 44fca87241e457bcb7f7ebd81eb7ae6d7b7f7868 (patch) | |
| tree | 4a681ce35f73d13150b366fd4b4c3ddefcd332f4 /src/corelib/global/qlibraryinfo.h | |
| parent | 8e98a07b306b45c6a86a237a03bc368074629e35 (diff) | |
complete reversal of adding QLibraryInfo to the bootstrap library
amends 684028a64.
Change-Id: I8dcc4b74c4c0328c07711cd7253ff19a74ea2fbf
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.h')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 543c4b3828..80d19f415c 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -73,7 +73,7 @@ public: TestsPath, // Insert new values above this line // Please read the comments in qlibraryinfo.cpp before adding -#ifdef QT_BOOTSTRAPPED +#ifdef QT_BUILD_QMAKE // These are not subject to binary compatibility constraints SysrootPath, HostPrefixPath, @@ -87,7 +87,7 @@ public: SettingsPath = 100 }; static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path() -#ifdef QT_BOOTSTRAPPED +#ifdef QT_BUILD_QMAKE enum PathGroup { FinalPaths, EffectivePaths, EffectiveSourcePaths }; static QString rawLocation(LibraryLocation, PathGroup); #endif |