diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
| commit | d5098f2802255da10b749b93705084ad1fdfc6a5 (patch) | |
| tree | 6462008a4ab7d13435d93490fed96c62c516cbdf /src/corelib/global/global.pri | |
| parent | d5a85940f785459d7b982d5fdf59a9fd18825092 (diff) | |
| parent | b5b41c18345719612e5411cc482466d2dbafdaf7 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
Diffstat (limited to 'src/corelib/global/global.pri')
| -rw-r--r-- | src/corelib/global/global.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 49128374e0..58cff6b81c 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -11,7 +11,9 @@ HEADERS += \ global/qnumeric.h \ global/qlogging.h \ global/qtypeinfo.h \ - global/qsysinfo.h + global/qsysinfo.h \ + global/qisenum.h \ + global/qtypetraits.h SOURCES += \ global/qglobal.cpp \ |