diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-02-28 11:55:26 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-02-28 11:55:42 (GMT) |
| commit | 8190ee79bdaebd8aaa985442c60268c1fcabe719 (patch) | |
| tree | 4f44e85e50bb6120f241338754669db57be7071c /mkspecs | |
| parent | f8ca41ab91748a4b847892af642c1a5a1cdeb105 (diff) | |
| parent | 242585ec2671b5c7ac6ef451cc1f5a38ee739df2 (diff) | |
| download | Qt-8190ee79bdaebd8aaa985442c60268c1fcabe719.zip Qt-8190ee79bdaebd8aaa985442c60268c1fcabe719.tar.gz Qt-8190ee79bdaebd8aaa985442c60268c1fcabe719.tar.bz2 | |
Merge remote branch 'earth/master' into master
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 2 | ||||
| -rw-r--r-- | mkspecs/symbian-gcce/qmake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index cffc859..b248117 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -33,7 +33,7 @@ QMAKE_LINK_OBJECT_SCRIPT = objects is_using_gnupoc { DEFINES *= __QT_PRODUCT_INCLUDE_IS_LOWERCASE__ } -QMAKE_SYMBIAN_INCLUDES = $$[QT_INSTALL_DATA]/mkspecs/common/symbian/symbianincludes.h +QMAKE_SYMBIAN_INCLUDES = $$IN_PWD/symbianincludes.h symbian-armcc { QMAKE_CFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES QMAKE_CXXFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf index 1d1053c..f550751a 100644 --- a/mkspecs/symbian-gcce/qmake.conf +++ b/mkspecs/symbian-gcce/qmake.conf @@ -54,7 +54,7 @@ DEFINES += __GCCE__ \ UNICODE QMAKE_LFLAGS_APP += --entry=_E32Startup -u _E32Startup -QMAKE_LFLAGS_SHLIB += -shared --default-symver --entry _E32Dll -u _E32Dll +QMAKE_LFLAGS_SHLIB += -shared --default-symver --entry=_E32Dll -u _E32Dll QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB gcceExtraFlags = --include=$${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script |