From 485edb4ec1f231b70eb5e2fa5a6e1ef584011e36 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 15 Aug 2012 08:56:24 +0200 Subject: uikit: Adapt readme and examples to recent changes Use the new configure option (4720003c8f52ad7ecb59be04e1b5aa319c2f0ff0) Add info about mkspecs (c13df9f2147e85e104ac105f975ef87914c908e9) Change-Id: I4eadd4807a36400de3cf261605e3e1a71d217bbc Reviewed-by: Ian Dean Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/platforms/uikit/README | 19 +++++++++++++++---- .../platforms/uikit/examples/flickrdemo/main.mm | 11 +---------- src/plugins/platforms/uikit/examples/qmltest/main.mm | 11 +---------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/plugins/platforms/uikit/README b/src/plugins/platforms/uikit/README index 1df564e..42ce159 100644 --- a/src/plugins/platforms/uikit/README +++ b/src/plugins/platforms/uikit/README @@ -39,18 +39,29 @@ configuration *and* the simulator specific target are active. To build for devic make sure that both the Device configuration *and* the device specific target are active. -The setup is configured to use the iOS 4.3 SDKs, you might want to edit the mkspecs -to fit your need. +The setup tries to figure out the Xcode and SDK version itself. If the autodetection +does not work for your setup, you can explicitly set values in +mkspecs/common/ios/versions.conf + +You need to choose one of the iOS mkspecs: +For Xcode 4.3 and later: macx-ios*-clang + macx-ios*-g++ (not installed by default) + macx-ios*-llvm +For Xcode 4.2 and earlier: macx-ios*-clang-legacy + macx-ios*-g++-legacy (not installed by default in 4.2) + macx-ios*-llvm-legacy + +The configure options below use macx-ios*-clang by default. After configuring and building Qt you need to also build src/plugins/platforms/uikit. Simulator: ---------- -configure -qpa -xplatform qpa/macx-iphonesimulator-g++ -arch i386 -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations -little-endian -host-little-endian +configure -qpa uikit -xplatform unsupported/macx-iossimulator-clang -arch i386 -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations -little-endian -host-little-endian Device: ------- -configure -qpa -xplatform qpa/macx-iphonedevice-g++ -arch armv7 -no-neon -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations -little-endian -host-little-endian +configure -qpa -xplatform unsupported/macx-iosdevice-clang -arch armv7 -no-neon -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations -little-endian -host-little-endian 3) XCode setup: - there are examples in the examples subdirectory of the platform plugin diff --git a/src/plugins/platforms/uikit/examples/flickrdemo/main.mm b/src/plugins/platforms/uikit/examples/flickrdemo/main.mm index 082a3f3..f2ed6cd 100644 --- a/src/plugins/platforms/uikit/examples/flickrdemo/main.mm +++ b/src/plugins/platforms/uikit/examples/flickrdemo/main.mm @@ -65,16 +65,7 @@ int main(int argc, char *argv[]) { NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - // force uikit platform plugin - QByteArray platform("-platform"); - QByteArray uikit("uikit"); - int ac = 3; - char *av[3]; - av[0] = argv[0]; - av[1] = platform.data(); - av[2] = uikit.data(); - - QApplication app(ac, av); + QApplication app(argc, argv); QmlApplicationViewer viewer; viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer.engine()->setOfflineStoragePath(documentsDirectory()); diff --git a/src/plugins/platforms/uikit/examples/qmltest/main.mm b/src/plugins/platforms/uikit/examples/qmltest/main.mm index 71aae13..9e27a38 100644 --- a/src/plugins/platforms/uikit/examples/qmltest/main.mm +++ b/src/plugins/platforms/uikit/examples/qmltest/main.mm @@ -65,16 +65,7 @@ int main(int argc, char *argv[]) { NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - // force uikit platform plugin - QByteArray platform("-platform"); - QByteArray uikit("uikit"); - int ac = 3; - char *av[3]; - av[0] = argv[0]; - av[1] = platform.data(); - av[2] = uikit.data(); - - QApplication app(ac, av); + QApplication app(argc, argv); QmlApplicationViewer viewer; viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer.engine()->setOfflineStoragePath(documentsDirectory()); -- cgit v0.12