summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mkspecs/features/symbian/debug.prf2
-rw-r--r--mkspecs/features/symbian/release.prf2
-rw-r--r--mkspecs/symbian/features/symbian_building.prf8
-rw-r--r--mkspecs/symbian/linux-armcc/features/qt.prf12
-rw-r--r--mkspecs/symbian/linux-armcc/qmake.conf8
-rw-r--r--mkspecs/symbian/linux-gcce/features/qt.prf28
-rw-r--r--mkspecs/symbian/linux-gcce/qmake.conf13
7 files changed, 27 insertions, 46 deletions
diff --git a/mkspecs/features/symbian/debug.prf b/mkspecs/features/symbian/debug.prf
index 19f5348..b5afeb6 100644
--- a/mkspecs/features/symbian/debug.prf
+++ b/mkspecs/features/symbian/debug.prf
@@ -1 +1 @@
-QMAKE_LIBDIR_QT += $${EPOCROOT}epoc32/release/armv5/udeb
+QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/udeb
diff --git a/mkspecs/features/symbian/release.prf b/mkspecs/features/symbian/release.prf
index abfa3ac..8164495 100644
--- a/mkspecs/features/symbian/release.prf
+++ b/mkspecs/features/symbian/release.prf
@@ -1 +1 @@
-QMAKE_LIBDIR_QT += $${EPOCROOT}epoc32/release/armv5/urel
+QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/urel
diff --git a/mkspecs/symbian/features/symbian_building.prf b/mkspecs/symbian/features/symbian_building.prf
index f1907c2..4760e09 100644
--- a/mkspecs/symbian/features/symbian_building.prf
+++ b/mkspecs/symbian/features/symbian_building.prf
@@ -69,7 +69,7 @@ isEmpty(VERSION) {
}
splitVersion = $$split(VERSION, ".")
-count(splitVersion, 1) {
+count(splitVersion, 0) {
# Default Symbian version if none is specified.
hexVersion = "000a0000"
decVersion = "10.0"
@@ -172,8 +172,10 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") {
}
# Symbian resource files
-
-linux-armcc:symbian_resources_INCLUDES = -I$$(RVCT22INC)
+linux-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_DEFINES = $$join(DEFINES, " -D", "-D")
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
diff --git a/mkspecs/symbian/linux-gcce/features/qt.prf b/mkspecs/symbian/linux-gcce/features/qt.prf
deleted file mode 100644
index fd2cd1b..0000000
--- a/mkspecs/symbian/linux-gcce/features/qt.prf
+++ /dev/null
@@ -1,28 +0,0 @@
-QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib
-
-INCLUDEPATH = $${EPOCROOT}epoc32/include/variant \
- $${EPOCROOT}epoc32/include/stdapis \
- $${EPOCROOT}epoc32/include/gcce \
- ${EPOCROOT}epoc32/include/stdapis/sys \
- ${EPOCROOT}epoc32/include/stdapis/stlport \
- $$INCLUDEPATH
-
-DEFINES *= __PRODUCT_INCLUDE__=\<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh\> \
- __SYMBIAN32__ \
- __MARM_INTERWORK__ \
- NDEBUG \
- _UNICODE \
- __S60_50__ \
- __S60_3X__ \
- __SERIES60_3X__ \
- __GCCE__ \
- __EPOC32__ \
- __MARM__ \
- __EABI__ \
- __MARM_ARMV5__ \
- __EXE__ \
- UNICODE \
- _STLP_NO_EXCEPTION_HEADER \
- __SUPPORT_CPP_EXCEPTIONS__
-
-load(qt)
diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf
index 3eb6d56..0d81693 100644
--- a/mkspecs/symbian/linux-gcce/qmake.conf
+++ b/mkspecs/symbian/linux-gcce/qmake.conf
@@ -56,7 +56,7 @@ DEFINES += __GCCE__ \
QMAKE_LFLAGS_APP += --entry _E32Startup
QMAKE_LFLAGS_SHLIB += --default-symver
-gcceExtraFlags = -I${EPOCROOT}epoc32/include/ --include=${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -fvisibility-inlines-hidden -msoft-float -T script
+gcceExtraFlags = --include=${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -fvisibility-inlines-hidden -msoft-float -T script
QMAKE_CFLAGS += $${gcceExtraFlags}
QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time
@@ -78,3 +78,14 @@ for(line, QMAKE_GCC_SEARCH_DIRS) {
}
}
}
+
+QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib
+
+INCLUDEPATH = ${EPOCROOT}epoc32/include/ \
+ $${EPOCROOT}epoc32/include/variant \
+ $${EPOCROOT}epoc32/include/stdapis \
+ $${EPOCROOT}epoc32/include/gcce \
+ ${EPOCROOT}epoc32/include/stdapis/sys \
+ ${EPOCROOT}epoc32/include/stdapis/stlport \
+ $$INCLUDEPATH
+