summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
authorAnderson Lizardo <anderson.lizardo@openbossa.org>2009-09-07 00:03:55 (GMT)
committeraxis <qt-info@nokia.com>2009-11-17 09:27:19 (GMT)
commit415c9a230a957f17c759468c5333266968f74b96 (patch)
tree0aa8e4a638952fe97a575be36b26b890b6a8e02f /mkspecs/common
parent1609689ad1b9672fd4598aa30a7429b9d37bc3ca (diff)
downloadQt-415c9a230a957f17c759468c5333266968f74b96.zip
Qt-415c9a230a957f17c759468c5333266968f74b96.tar.gz
Qt-415c9a230a957f17c759468c5333266968f74b96.tar.bz2
Add Linux host support to Symbian mkspecs.
Signed-off-by: axis <qt-info@nokia.com>
Diffstat (limited to 'mkspecs/common')
-rw-r--r--mkspecs/common/symbian/symbian.conf12
1 files changed, 9 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index fe698fb..0bd15fc 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -73,7 +73,7 @@ QMAKE_LIBS_COMPAT =
QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib
QMAKE_LIBS_S60 = -lavkon
-!isEmpty(QMAKE_SH) {
+win32:!isEmpty(QMAKE_SH) | unix {
QMAKE_COPY = cp
QMAKE_COPY_DIR = cp -r
QMAKE_MOVE = mv
@@ -91,9 +91,15 @@ QMAKE_LIBS_S60 = -lavkon
QMAKE_CHK_DIR_EXISTS = if not exist
}
+win32 {
QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
+} else {
+QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc
+QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic
+QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc
+}
QMAKE_IDL = midl
QMAKE_LIB = ar -ru
@@ -130,10 +136,10 @@ default_deployment.pkg_prerules = \
DEPLOYMENT += default_deployment
-exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.0.sis) {
+exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
S60_VERSION = 5.0
} else {
- exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/Series60v3.2.sis) {
+ exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis )|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
S60_VERSION = 3.2
} else {
S60_VERSION = 3.1