diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-20 10:34:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 12:38:32 +0200 |
| commit | 6d9c545d2b83305c3c30a0e917e6c3a474dfe66a (patch) | |
| tree | 54a003c6db32c85f80c5fbb46dbf9322855966e6 /src/corelib/global/qlibraryinfo.h | |
| parent | 86f953a6d40666a3355e76b3ab2c8a2cf5452ec6 (diff) | |
| parent | b652bffea7a0a1bf209c21d9b73f509226f031bd (diff) | |
Merge "Merge branch 'buildsystem'" into refs/staging/master
Diffstat (limited to 'src/corelib/global/qlibraryinfo.h')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 5666afbad8..5861b4b8bd 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -90,7 +90,8 @@ public: }; static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path() #ifdef QT_BUILD_QMAKE - static QString rawLocation(LibraryLocation); + enum PathGroup { FinalPaths, EffectivePaths }; + static QString rawLocation(LibraryLocation, PathGroup); #endif private: |