diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-28 17:26:59 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 21:00:18 +0100 |
| commit | 6663b5ebac7f750a3fb53dc61fbfb466bebec931 (patch) | |
| tree | 4413f90c31d92bcd79d854150bb3324c65e8c453 | |
| parent | 8c7aa37aa7d34860a9c062808416cef0118b36d6 (diff) | |
exclude some code from the qmake build
Change-Id: Ic989a2cc5106496a2c5f13c863a0a87d5cd2d963
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index ff1fd6bfdd..c7f0cd1c28 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -148,6 +148,8 @@ QSettings *QLibraryInfoPrivate::findConfiguration() \sa QSysInfo, {Using qt.conf} */ +#ifndef QT_BUILD_QMAKE + /*! \internal You cannot create a QLibraryInfo, instead only the static functions are available to query @@ -210,6 +212,8 @@ QLibraryInfo::isDebugBuild() return false; } +#endif // QT_BUILD_QMAKE + static const struct { char key[14], value[13]; } qtConfEntries[] = { |