summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2011-08-10 07:38:57 (GMT)
committerEike Ziller <eike.ziller@nokia.com>2011-08-17 08:04:50 (GMT)
commit6e0dd8c70a467771f4633b8e0c39bc071fffe0b4 (patch)
tree6ca65cdf30868d74024040cb4ca09deb9f77220e
parent6be1b235f7db38146f7080a4bfcfe3051ae54699 (diff)
downloadQt-6e0dd8c70a467771f4633b8e0c39bc071fffe0b4.zip
Qt-6e0dd8c70a467771f4633b8e0c39bc071fffe0b4.tar.gz
Qt-6e0dd8c70a467771f4633b8e0c39bc071fffe0b4.tar.bz2
Use thumb instructions for uikit
-rw-r--r--mkspecs/qpa/macx-iphonedevice-g++/qmake.conf6
-rw-r--r--src/plugins/platforms/uikit/README3
2 files changed, 4 insertions, 5 deletions
diff --git a/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf b/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
index d69f58d..faec47d 100644
--- a/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
+++ b/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
@@ -43,10 +43,10 @@ QMAKE_CXX = /Developer/Platforms/iPhoneOS.platform/Developer/usr/b
QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX
-QMAKE_CFLAGS += -arch armv7 -marm -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
+QMAKE_CFLAGS += -arch armv7 -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_OBJECTIVE_CFLAGS += -arch armv7 -marm -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
-QMAKE_LFLAGS += -arch armv7 -marm -miphoneos-version-min=4.2 -Wl,-syslibroot,$$QMAKE_IOS_SDK
+QMAKE_OBJECTIVE_CFLAGS += -arch armv7 -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2
+QMAKE_LFLAGS += -arch armv7 -miphoneos-version-min=4.2 -Wl,-syslibroot,$$QMAKE_IOS_SDK
QMAKE_LFLAGS += -framework Foundation -framework UIKit -framework QuartzCore -lz
QMAKE_INCDIR_OPENGL =
diff --git a/src/plugins/platforms/uikit/README b/src/plugins/platforms/uikit/README
index f6f3927..795e72a 100644
--- a/src/plugins/platforms/uikit/README
+++ b/src/plugins/platforms/uikit/README
@@ -58,8 +58,7 @@ configure -qpa -xplatform qpa/macx-iphonedevice-g++ -arch armv7 -no-neon -develo
to the include search paths.
- add "$(SRCROOT)/../qmltest" to the include search path if you didn't copy but
linked to the qmlapplicationviewer
- - for device set the architecture to armv7 only and make sure you
- don't compile for thumb
+ - for device set the architecture to armv7 only
- to use sound in your application, Q_IMPORT_PLUGIN(phonon_av),
#include <phonon/private/factory_p.h>,
and call Phonon::Factory::setBackend(qt_plugin_instance_phonon_av());