diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 16:46:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 16:46:22 (GMT) |
| commit | 677f1b4af363845189d93bf564ab9ba97eb160e0 (patch) | |
| tree | 4ce28ac9da762eeece98d6f031cecbcc897afde1 /qmake/generators/symbian/symmake.h | |
| parent | 981b7c1be2e0316c326b8e8485855c8d1812b8cc (diff) | |
| parent | 39e9a7b6d57af121bb19856a2c219b94799680ce (diff) | |
| download | Qt-677f1b4af363845189d93bf564ab9ba97eb160e0.zip Qt-677f1b4af363845189d93bf564ab9ba97eb160e0.tar.gz Qt-677f1b4af363845189d93bf564ab9ba97eb160e0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix extensions section in bld.inf when CONFIG contains symbian_test
Diffstat (limited to 'qmake/generators/symbian/symmake.h')
| -rw-r--r-- | qmake/generators/symbian/symmake.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h index 542284c..ca697b4 100644 --- a/qmake/generators/symbian/symmake.h +++ b/qmake/generators/symbian/symmake.h @@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE #define BLD_INF_FILENAME "bld.inf" #define MAKEFILE_DEPENDENCY_SEPARATOR " \\\n\t" - #define QT_EXTRA_INCLUDE_DIR "tmp" #define MAKE_CACHE_NAME ".make.cache" +#define SYMBIAN_TEST_CONFIG "symbian_test" class SymbianMakefileGenerator : public MakefileGenerator { |