[Development] Merging of initial iOS work to dev
Tor Arne Vestbø
tor.arne.vestbo at digia.com
Mon Feb 18 16:32:14 CET 2013
Hey all!
We're ready to merge the initial iOS work that's been going on in the
'ios' branch. Most of the changes are to src/plugins/platforms/ios/ and
the makespecs, and have had reviews along the way, but approvers and
maintainers are encouraged to look for changes that might affect their
areas.
To build use the following configure line:
-xplatform unsupported/macx-ios-clang -no-pkg-config -nomake examples
-nomake tests
And append '-sdk iphonesimulator' to build for the simulator and not device.
Some widget-examples work out of the box, others don't. Running qmake
for an example should generate an Xcode project ready for deployment.
We'll get back to you with a wiki-entry describing in more detail which
features and examples are expected to work in the iOS tech preview once
we're closer to the 5.1 release.
The plan is to merge these initial changes before the freeze on Friday.
Here's a stat of the changes:
> configure | 13 +-
> mkspecs/common/clang-mac.conf | 2 +
> mkspecs/common/ios.conf | 14 +-
> mkspecs/common/ios/GLES/gl.h | 43 ---
> mkspecs/common/ios/arch.conf | 84 -----
> mkspecs/common/ios/clang.conf | 51 ++-
> mkspecs/common/ios/g++.conf | 21 --
> mkspecs/common/ios/llvm.conf | 31 --
> mkspecs/common/ios/qmake.conf | 60 +---
> mkspecs/common/ios/versions.conf | 184 ----------
> mkspecs/common/mac/qplatformdefs.h | 2 -
> mkspecs/common/xcode.conf | 13 +
> mkspecs/features/configure.prf | 2 +
> mkspecs/features/ios.prf | 25 ++
> mkspecs/features/ios/default_post.prf | 41 +++
> mkspecs/features/ios/default_pre.prf | 4 +
> mkspecs/features/mac/sdk.prf | 10 +-
> mkspecs/macx-llvm/qmake.conf | 2 +
> mkspecs/unsupported/macx-ios-clang/Info.plist.app | 20 ++
> mkspecs/unsupported/macx-ios-clang/Info.plist.lib | 18 +
> mkspecs/unsupported/macx-ios-clang/qmake.conf | 30 ++
> mkspecs/unsupported/macx-ios-clang/qplatformdefs.h | 42 +++
> mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf | 35 --
> mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iosdevice-clang/qmake.conf | 35 --
> mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf | 35 --
> mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iosdevice-g++/qmake.conf | 35 --
> mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf | 35 --
> mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf | 35 --
> mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf | 6 -
> mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iossimulator-clang/qmake.conf | 6 -
> mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf | 33 --
> mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iossimulator-g++/qmake.conf | 33 --
> mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf | 33 --
> mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h | 42 ---
> mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf | 33 --
> mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h | 42 ---
> qmake/generators/mac/pbuilder_pbx.cpp | 642 ++++++++++++++++------------------
> qmake/generators/unix/unixmake2.cpp | 2 +-
> qmake/main.cpp | 5 +
> src/corelib/global/qsystemdetection.h | 6 +
> src/corelib/kernel/qcore_mac_p.h | 2 +
> src/gui/gui.pro | 4 +-
> src/gui/opengl/qopenglpaintdevice.cpp | 11 +-
> src/gui/opengl/qopenglpaintdevice.h | 1 +
> src/network/kernel/kernel.pri | 6 +-
> src/platformsupport/fontdatabases/mac/coretext.pri | 1 +
> src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 +
> src/platformsupport/platformsupport.pro | 2 +-
> src/plugins/platforms/cocoa/cocoa.pro | 2 +-
> src/plugins/platforms/ios/ios.json | 3 +
> src/plugins/platforms/ios/ios.pro | 3 +
> src/plugins/platforms/ios/plugin.mm | 69 ++++
> src/plugins/platforms/ios/plugin.pro | 35 ++
> src/plugins/platforms/ios/qiosapplicationdelegate.h | 53 +++
> src/plugins/platforms/ios/qiosapplicationdelegate.mm | 94 +++++
> src/plugins/platforms/ios/qiosbackingstore.h | 70 ++++
> src/plugins/platforms/ios/qiosbackingstore.mm | 125 +++++++
> src/plugins/platforms/ios/qioscontext.h | 91 +++++
> src/plugins/platforms/ios/qioscontext.mm | 203 +++++++++++
> src/plugins/platforms/ios/qioseventdispatcher.h | 130 +++++++
> src/plugins/platforms/ios/qioseventdispatcher.mm | 320 +++++++++++++++++
> src/plugins/platforms/ios/qiosglobal.h | 67 ++++
> src/plugins/platforms/ios/qiosglobal.mm | 144 ++++++++
> src/plugins/platforms/ios/qiosinputcontext.h | 73 ++++
> src/plugins/platforms/ios/qiosinputcontext.mm | 142 ++++++++
> src/plugins/platforms/ios/qiosintegration.h | 86 +++++
> src/plugins/platforms/ios/qiosintegration.mm | 171 +++++++++
> src/plugins/platforms/ios/qiosscreen.h | 88 +++++
> src/plugins/platforms/ios/qiosscreen.mm | 238 +++++++++++++
> src/plugins/platforms/ios/qiossoftwareinputhandler.h | 71 ++++
> src/plugins/platforms/ios/qiostheme.h | 64 ++++
> src/plugins/platforms/ios/qiostheme.mm | 96 +++++
> src/plugins/platforms/ios/qiosviewcontroller.h | 46 +++
> src/plugins/platforms/ios/qiosviewcontroller.mm | 90 +++++
> src/plugins/platforms/ios/qioswindow.h | 103 ++++++
> src/plugins/platforms/ios/qioswindow.mm | 523 +++++++++++++++++++++++++++
> src/plugins/platforms/ios/qtmain.mm | 93 +++++
> src/plugins/platforms/ios/qtmain.pro | 8 +
> src/plugins/platforms/platforms.pro | 5 +-
> src/printsupport/dialogs/dialogs.pri | 2 +-
> src/testlib/qtestcase.cpp | 10 +-
> src/widgets/kernel/mac.pri | 2 +-
> src/widgets/styles/qstyleoption.cpp | 2 +-
> 93 files changed, 3920 insertions(+), 1656 deletions(-)
Best regards,
Tor Arne
More information about the Development
mailing list