diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-11 15:22:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 17:25:23 +0200 |
| commit | 074a5ce50e10785bd7c10d9b3120905b9042f9e0 (patch) | |
| tree | 2b018e308fa619f677035cb06f4aa37eff04d110 /src/corelib/global/qglobal.h | |
| parent | 0b2d55390c20d70c4bfac1fa4ec3f580be0b907e (diff) | |
don't require (dummy) qconfig.h for qmake build
Change-Id: I22a2c9aa1366ff858b3bb646617543968c810136
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 957e1c8267..ac67d33986 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -55,7 +55,7 @@ */ #define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#if !defined(QT_BUILD_MOC) +#if !defined(QT_BUILD_MOC) && !defined(QT_BUILD_QMAKE) #include <QtCore/qconfig.h> #endif |