summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-09-06 13:17:24 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-09-06 13:26:37 (GMT)
commit58d0e747348eb89723abd515d864da5316cba760 (patch)
tree8dc2375dd9c886624c465bb917cd5f0dff32a35f
parent890b99843f4e7bcbb010a64f87f191634b1b01ba (diff)
downloadQt-58d0e747348eb89723abd515d864da5316cba760.zip
Qt-58d0e747348eb89723abd515d864da5316cba760.tar.gz
Qt-58d0e747348eb89723abd515d864da5316cba760.tar.bz2
Fix qt.conf for Symbian to use $${EPOCROOT}
$(EPOCROOT) in qt.conf resolves epocroot from environment variable, which is wrong when doing full platform build and qmake is executed in context of sbsv2 tools build. The correct way to resolve epocroot in qt.conf is to use $${EPOCROOT}. Reviewed-by: TrustMe
-rw-r--r--config.profiles/symbian/qt.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/config.profiles/symbian/qt.conf b/config.profiles/symbian/qt.conf
index 29dfa88..072fd7b 100644
--- a/config.profiles/symbian/qt.conf
+++ b/config.profiles/symbian/qt.conf
@@ -1,6 +1,6 @@
[Paths]
-Data = $(EPOCROOT)epoc32/tools/qt
-Headers = $(EPOCROOT)epoc32/include/mw
-Binaries = $(EPOCROOT)epoc32/tools
-Prefix = $(EPOCROOT)sf/mw/qt
+Data = $${EPOCROOT}epoc32/tools/qt
+Headers = $${EPOCROOT}epoc32/include/mw
+Binaries = $${EPOCROOT}epoc32/tools
+Prefix = $${EPOCROOT}sf/mw/qt