diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-03-08 12:43:08 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-03-09 11:59:26 (GMT) |
| commit | c6333338b900f0571428af84f1da74aa9dfb1a80 (patch) | |
| tree | da6764e2fe6b283bd3894a71665ac4c85faee9f0 /mkspecs/symbian/linux-armcc | |
| parent | aaf189b084f524c6e4230fddb25b8494364d83e9 (diff) | |
| download | Qt-c6333338b900f0571428af84f1da74aa9dfb1a80.zip Qt-c6333338b900f0571428af84f1da74aa9dfb1a80.tar.gz Qt-c6333338b900f0571428af84f1da74aa9dfb1a80.tar.bz2 | |
Make sure that we have all compile flags available always
Users may do a CONFIG -= qt which means that the qt.prf won't
be loaded. So, lets make sure we don't have any critical properties
in those files.
Diffstat (limited to 'mkspecs/symbian/linux-armcc')
| -rw-r--r-- | mkspecs/symbian/linux-armcc/features/qt.prf | 12 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/mkspecs/symbian/linux-armcc/features/qt.prf b/mkspecs/symbian/linux-armcc/features/qt.prf deleted file mode 100644 index f8a074d..0000000 --- a/mkspecs/symbian/linux-armcc/features/qt.prf +++ /dev/null @@ -1,12 +0,0 @@ -QMAKE_LIBDIR_QT += $${EPOCROOT}epoc32/release/armv5/lib -QMAKE_LIBDIR_QT *= $$(RVCT22LIB) - -INCLUDEPATH = $${EPOCROOT}epoc32/include \ - $${EPOCROOT}epoc32/include/rvct2_2 \ - $${EPOCROOT}epoc32/include/variant \ - $${EPOCROOT}epoc32/include/stdapis \ - $$INCLUDEPATH - -DEFINES *= __PRODUCT_INCLUDE__=$${EPOCROOT}epoc32/include/variant/symbian_os.hrh - -load(qt) diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index a8194b2..f8c666a 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -20,3 +20,11 @@ DEFINES += EKA2 \ __ARMcc_2__ \ __ARMCC_2_2__ +QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib +QMAKE_LIBDIR *= $$(RVCT22LIB) + +INCLUDEPATH = $${EPOCROOT}epoc32/include \ + $${EPOCROOT}epoc32/include/rvct2_2 \ + $${EPOCROOT}epoc32/include/variant \ + $${EPOCROOT}epoc32/include/stdapis \ + $$INCLUDEPATH |