diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-11-15 17:28:27 +0100 |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-11-15 17:28:27 +0100 |
| commit | 75c2d2fb2d29f33d85c801c68c1a8f823e4b8c3c (patch) | |
| tree | 7b32dbe23b8ef8158e4e36f26b3483530c80eb6d /qmake | |
| parent | a74ba4514efac05c7af6f4824ca622dd5d5a2698 (diff) | |
| download | qt4-tools-75c2d2fb2d29f33d85c801c68c1a8f823e4b8c3c.tar.gz | |
Add INTEGRITY gbuild.* files to qmake project.
This allows building and debugging qmake from Qt Creator.
Merge-request: 1438
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/qmake.pri | 6 | ||||
| -rw-r--r-- | qmake/qmake.pro | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index c2fc1d51e8..f2a37054f0 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -22,7 +22,8 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/symbian/initprojectdeploy_symbian.cpp \ generators/integrity/gbuild.cpp \ windows/registry.cpp \ - symbian/epocroot.cpp + symbian/epocroot.cpp \ + generators/integrity/gbuild.cpp HEADERS += project.h property.h generators/makefile.h \ generators/unix/unixmake.h meta.h option.h cachekeys.h \ @@ -39,7 +40,8 @@ HEADERS += project.h property.h generators/makefile.h \ generators/symbian/initprojectdeploy_symbian.h \ generators/integrity/gbuild.h \ windows/registry_p.h \ - symbian/epocroot_p.h + symbian/epocroot_p.h \ + generators/integrity/gbuild.h contains(QT_EDITION, OpenSource) { DEFINES += QMAKE_OPENSOURCE_EDITION diff --git a/qmake/qmake.pro b/qmake/qmake.pro index b602afa198..38e0fcee13 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -25,6 +25,7 @@ INCLUDEPATH += . \ generators/win32 \ generators/mac \ generators/symbian \ + generators/integrity \ $$QT_SOURCE_TREE/include \ $$QT_SOURCE_TREE/include/QtCore \ $$QT_SOURCE_TREE/qmake |