summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-07-27 09:12:46 (GMT)
committerLiang Qi <liang.qi@nokia.com>2010-10-21 09:12:14 (GMT)
commit185abbd1dcaf2d882f2225a874bafafb9815a8eb (patch)
treebb5874be84f679e138edbb11b83dd0385b485763 /src
parentc4988eda033ce8b081e2301e80b344be20844e14 (diff)
downloadQt-185abbd1dcaf2d882f2225a874bafafb9815a8eb.zip
Qt-185abbd1dcaf2d882f2225a874bafafb9815a8eb.tar.gz
Qt-185abbd1dcaf2d882f2225a874bafafb9815a8eb.tar.bz2
Renamed the symbian/linux-* mkspecs to symbian-*.
This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/global.pri2
-rw-r--r--src/s60main/s60main.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 4800716..ad386a8 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -19,7 +19,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
# Only used on platforms with CONFIG += precompile_header
PRECOMPILED_HEADER = global/qt_pch.h
-linux*:!static:!linux-armcc:!linux-gcce {
+linux*:!static:!symbian-armcc:!symbian-gcce {
QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate
prog=$$quote(if (/program interpreter: (.*)]/) { print $1; })
DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index a273897..c1d3672 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -29,7 +29,7 @@ symbian {
# Having MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA will cause s60main.lib be unlinkable
# against GCCE apps, so remove it
MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
- linux-armcc:QMAKE_CXXFLAGS *= --export_all_vtbl
+ symbian-armcc:QMAKE_CXXFLAGS *= --export_all_vtbl
} else {
error("$$_FILE_ is intended only for Symbian!")
}