diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-22 13:14:25 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-22 13:43:32 (GMT) |
| commit | d7d0b1528fd200fc3110093244b8265fdf457238 (patch) | |
| tree | d44b84eec60e14f3c0e4a535d46d5e6a4058bf96 | |
| parent | 348fef0a406006ac813732ad5b8a143d8a63e879 (diff) | |
| download | Qt-d7d0b1528fd200fc3110093244b8265fdf457238.zip Qt-d7d0b1528fd200fc3110093244b8265fdf457238.tar.gz Qt-d7d0b1528fd200fc3110093244b8265fdf457238.tar.bz2 | |
Fix symbian-mmp.conf include path
Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding
include path that points under mkspecs.
Task-number: QTBUG-15501
Reviewed-by: axis
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 4 | ||||
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index 1fbd302..4d554bd 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -18,8 +18,8 @@ MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6 INCLUDEPATH = \ - $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \ - $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \ + $$[QT_INSTALL_DATA]/mkspecs/common/symbian/stl-off \ + $$[QT_INSTALL_DATA]/mkspecs/common/symbian \ $${EPOCROOT}epoc32/include \ $$OS_LAYER_LIBC_SYSTEMINCLUDE \ $$INCLUDEPATH diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 65d4b93..1fd5e16 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -12,7 +12,7 @@ INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE # Remove mkspecs/common/symbian/stl-off from beginning of includepath # in order to use new and delete operators from STL -INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off +INCLUDEPATH -= $$[QT_INSTALL_DATA]/mkspecs/common/symbian/stl-off # libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new # STDCPP turns on standard C++ new behaviour (ie. throwing new) |