diff options
| author | axis <qt-info@nokia.com> | 2011-01-07 06:39:08 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-04 10:43:37 (GMT) |
| commit | c9704566aa9186369bfdabd835b0f6723839310b (patch) | |
| tree | b28e5c6c7ab8e3cd79ba6c0c93b6e0850a8ed8fa | |
| parent | bc627fbe248c2efe9b05784182bf0da3b9c486d7 (diff) | |
| download | Qt-c9704566aa9186369bfdabd835b0f6723839310b.zip Qt-c9704566aa9186369bfdabd835b0f6723839310b.tar.gz Qt-c9704566aa9186369bfdabd835b0f6723839310b.tar.bz2 | |
Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.
This usually points to the RVCT include directory, but those headers
are not appropriate for Symbian.
RevBy: Trust me
| -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 545cb81..28046b4 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, "/$", "") |