diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-23 15:24:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-29 15:37:58 +0100 |
| commit | 08a737def9145a53615871bb5900f9794bf699f5 (patch) | |
| tree | 79344c4688bdce13acaeb422673dfb7876e8d9f8 /src/corelib/global/qglobal.h | |
| parent | 569ec1ab346e786e98a8e6884ed40a063a740832 (diff) | |
generate qfeatures.h at build time
much more elegant than the checked in file. and less chance to get it
wrong, as people often enough do.
Change-Id: I975a62dfd83ce4f15947ce54f3c40931b1badae0
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index c430da80fd..0fd9bab979 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -57,10 +57,9 @@ #if !defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_CONFIGURE) #include <QtCore/qconfig.h> -#endif - #include <QtCore/qfeatures.h> #define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE)) +#endif /* These two macros makes it possible to turn the builtin line expander into a * string literal. */ |