diff options
| author | axis <qt-info@nokia.com> | 2011-01-28 12:29:47 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-01-28 12:29:52 (GMT) |
| commit | edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0 (patch) | |
| tree | 221c64f67aeee3addfe19760322e1bd8bb2d79cd /mkspecs/features/symbian | |
| parent | 5e3c4b6a82df640c15778af72384c6b27f8860b7 (diff) | |
| parent | 8a443d2695344f26b9adf4310672e1a5fd62aeb5 (diff) | |
| download | Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.zip Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.gz Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.bz2 | |
Merge branch 'windowsMakefileBuildSupport' into earth-master
Diffstat (limited to 'mkspecs/features/symbian')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 8bb92be..678838c 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -1,6 +1,11 @@ symbian-armcc { QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC + # This is to prevent inclusion of the shipped RVCT headers, which are often in the + # environment variable RVCTxxINC by default. -J prevents the searching of that location, + # but needs a path, so just specify somewhere guaranteed not to contain header files. + QMAKE_CFLAGS += -J$${EPOCROOT}epoc32/ignore_this_path + QMAKE_CXXFLAGS += -J$${EPOCROOT}epoc32/ignore_this_path } else:symbian-gcce { QMAKE_CFLAGS += $$QMAKE_CFLAGS.GCCE QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.GCCE @@ -235,12 +240,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { } # Symbian resource files -symbian-armcc: { - SYMBIAN_RVCT22INC=$$(RVCT22INC) - !isEmpty(SYMBIAN_RVCT22INC):symbian_resources_INCLUDES = -I$${SYMBIAN_RVCT22INC} -} -symbian_resources_INCLUDES = $$replace(symbian_resources_INCLUDES, ",", " -I") -symbian_resources_INCLUDES += $$join(INCLUDEPATH, " -I", "-I") +symbian_resources_INCLUDES = $$join(INCLUDEPATH, " -I", "-I") symbian_resources_DEFINES = $$join(DEFINES, " -D", "-D") symbian_resources_DEFINES += -D__QT_SYMBIAN_RESOURCE__ symbian_resources_RCC_DIR = $$replace(RCC_DIR, "/$", "") |