summaryrefslogtreecommitdiffstats
path: root/mkspecs/macx-ios-clang/features
Commit message (Collapse)AuthorAgeFilesLines
* Fix iOS simulator build after 1f0823c (Rewrite simd.prf to share more code)Tor Arne Vestbø2014-07-301-0/+2
| | | | | | | | | | | Now that we rely on simd.prf for all SIMD sources (including NEON and SSE2), we need to ensure that CONFIG has the right SIMD values to match simulator. This worked before due to us checking QT_CPU_FEATURES.$$QT_ARCH and adding directly to SOURCES. Change-Id: I4ea7f559e83860eabff1948ad5d140bbb65454df Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-031-1/+1
|\ | | | | | | | | | | | | Manually fixed up: isES -> isOpenGLES src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
| * mkspec (iOS): use QTPLUGIN.platforms=-Richard Moe Gustavsen2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | After bbcdccd, a deprecation warning is written to the console every time you run qmake on iOS. This change will make use of the new QTPLUGIN.platforms=- instead if the deprecated CONFIG -= import_qpa_plugin Change-Id: I51e4f9d18f6abd87512a39b3236b89d5444fd6c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add make check target for iOSSimo Fält2014-04-151-0/+6
|/ | | | | | | | | | Enabling check target to run test apps in iPhone simulator. Task-number: QTBUG-36639 Change-Id: I700d998fe9f1a6c910431789e98e4789d820f3e4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Make Xcode debug info format controllable through a qmake variableTor Arne Vestbø2014-04-101-16/+0
| | | | | | | | | | The default is still DWARF instead of DWARF with dSYM for static builds of Qt, so that debug builds of the final application don't take forever to build due to generating the dSYM file. Change-Id: I370d800d7c959e05c1a8780c4ebf58fff250daa1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* iOS: Create folder for SUBDIR projectsMarkus Goetz2014-03-141-0/+1
| | | | | | | | | | | In case of a SUBDIR qmake project, it tried to cd into a directory that did not exist yet. I needed to run qmake twice to get it working. This fixes it. Change-Id: I6d322e9a7c96a9d82df77b9ba5f19711a8180ed0 Task-number: QTBUG-37429 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Explicitly use libstdc++ for non-C++11 static buildsTor Arne Vestbø2014-01-281-9/+0
| | | | | | | | | | | | | | | | | | | | | | Otherwise the compiler may choose libc++ based on the deployment target, and we'll end up with broken builds due to the mismatch between the two libraries, eg: Undefined symbols for architecture x86_64: "std::ios_base::Init::Init()", referenced from: __GLOBAL__I_a in libQt5Qml.a(qv4object.o) ... "std::ios_base::Init::~Init()", referenced from: __GLOBAL__I_a in libQt5Qml.a(qv4object.o) ... "std::__throw_length_error(char const*)", referenced from: ... This problem is not iOS specific, which is why the logic is moved to the more generic mac/default_post.prf. Change-Id: I28b94e614f9167fc0db84bbf1c88dd97d5629938 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* iOS: Disable tests for all other modules than qtbaseTor Arne Vestbø2014-01-251-0/+5
| | | | | | | | | Instead of sprinkling '!ios' all around the various modules. This is a bit more fine grained than the CFG_NOBUILD_PARTS += "tests" that we had in configure. Change-Id: I6ca2e5df118dfc0bb5d7b8495a3543f51dc0fa30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* iOS: Fix simulator build by enabling SSE2 code pathsTor Arne Vestbø2014-01-182-9/+12
| | | | | | | | | | | Commit 3c375a76a13e151496ccfea0a2b3ff9fdc75784f enabled SSE2 in Qt, but we failed to build the files that implemented the SSE2 specific drawhelpers and image functions. Since we know what the iOS simulator supports and the platforms it runs on we can safely enable this ourselves without it being based on a configure test. Change-Id: I0cfc43de80068b89aa47c34ffa84ee1c1734886c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* iOS: Prevent trying to use both libc++ and libstdc++Tor Arne Vestbø2014-01-161-1/+1
| | | | | | | | Static builds of Qt will automatically enable C++11 for all projects, but this happens in mac/default_post which is after our check. Change-Id: I22a01e5d876242263fa31f8a404a65905c6c1877 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* iOS: Use in-place string renaming to rename main() instead of ldTor Arne Vestbø2014-01-061-6/+1
| | | | | | | | | | | | | | | Processing the object file with ld strips away debug information for the main() function, resulting in the debugger not being able to break on specific lines of the function. It also causes issues when externing sybols in main's object file. We revert back to the approach of using the strings in-line in the object file (which is why we keep the name the same length, 'qtmn'). Task-number: QTBUG-35553 Change-Id: I8b0acee36f48ecfefa2e4fd008a842365713d985 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-051-0/+16
|\ | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
| * iOS: Use DWARF instead of DWARF with dSYM for debug buildsTor Arne Vestbø2013-12-031-0/+16
| | | | | | | | | | | | | | | | | | | | Generating the dSYM file takes a long time due to our relatively large static libraries, and is not really useful for a debug build where you are likely to have the object files and Qt libraries available on your host system for debugging anyways. Change-Id: Ie7549975f271de8c56ca04bd28b29e6ed65f16cb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | iOS: Explicitly use libstdc++ when C++11 support is not enabledTor Arne Vestbø2013-12-051-0/+9
|/ | | | | | | | Otherwise Xcode might choose to use libc++, eg when the deployment target is iOS7, and this doesn't work when Qt itself was built using libstdc++. Change-Id: I0b0f36666ed318be9aae87ebaeb0d344109566ac Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* iOS: Provide default launch image for 4-inch devicesTor Arne Vestbø2013-11-291-0/+10
| | | | | | | | | | | | | | | Otherwise the application will not scale to the full resolution of the device. We copy the image into the Xcode project, since it's internal to our build system and not meant as a template to be edited by the user. For 5.3 we need to provide a proper qmake/qbs mechanism to handle launch images. Task-number: QTBUG-31431 Change-Id: Ied0b2843a78c5ea865750e0404418ced7ad27082 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* iOS: Be more specific in where we look for object files to rename mainTor Arne Vestbø2013-10-311-3/+8
| | | | | | | | | When building under Xcode we can limit the object files search to the current SDK and debug/release configuration. Change-Id: Ic405f13f46a594e3ed20d82ca6b84e7e67edebfc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* iOS: Build libs (including Qt itself) for both simulator and deviceTor Arne Vestbø2013-10-301-45/+159
| | | | | | | | | | | | | | | | | | Conceptually a Qt for iOS SDK or source build should support building for both simulator and device, based on the same qmake binary and Qt libraries. Qt Creator or Xcode should then be able to use the same Qt version while still building for a single target at a time. This applies to user libraries as well, which shouldn't require switching to a different Qt when changing target platform from simulator to device. We achieve this by using Qt's exclusive_build feature, where we build for the two targets in parallel, and then teach Xcode how to choose the right library dynamically at build time. Change-Id: I06d60e120d986085fb8686ced98f22f7047c4f23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* iOS: Build simulator libraries with suffixTor Arne Vestbø2013-10-301-0/+4
| | | | | | | | Makes it possible to join two separate builds, and opens up for using exclusive builds to do this. Change-Id: I87ccbdd55511fdfbef3fe8b581f40525ebf077ed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* iOS: Set ARCHS in Xcode project for both simulator and device SDKsTor Arne Vestbø2013-10-281-7/+13
| | | | | | | | Removes the need to pass ARCHS to xcodebuild for simulator builds. Change-Id: If15e9d387c416c5c9f83c50f5903ae0cd517ff34 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* qmake: Expose qmake arguments as QMAKE_ARGSTor Arne Vestbø2013-10-241-1/+5
| | | | | | | | Allows project files or mkspecs to call qmake recursively using system() with the right arguments, which we use to fix the ios default_post.prf. Change-Id: I90d69e2b156bb0f0af1279188b11f81c84c24fb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* iOS: default_post: let xcodebuild_distclean depend on xcodebuild_cleanRichard Moe Gustavsen2013-10-211-0/+1
| | | | | | | | | Otherwise, make would upon distclean first remove the xcode project, then try to do xcodebuild distclean. xcodebuild would then complain about a missing project. Change-Id: I0a9a6af6d86d1a95e37f4bbafa38c63d892bf1cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* iOS: Don't hard-code simulator and device architecturesTor Arne Vestbø2013-10-181-2/+2
| | | | | Change-Id: Id5a370248b553b7393ec1b187bd34c0ab9f28496 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* iOS: Add default QT_ARCH for configure tests to our own qt_config.prfTor Arne Vestbø2013-10-182-10/+12
| | | | | | | | | | | Setting QT_ARCH when empty is a workaround for a missing qconfig.pri, since it hasn't been written yet by configure. As qconfig.pri is loaded by the generic qt_config.prf, putting our workaround in our own wrapper for qt_config makes sense, as it keeps the logic close to where the original QT_ARCH is resolved. Change-Id: I49ffc21cf5dea5ca5b6254ca8084a4dcdc359a72 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* iOS: Prevent stray non-expected rules/targets in Xcode-wrapper makefileTor Arne Vestbø2013-10-181-1/+4
| | | | | | Change-Id: Ibef10ba174df25aa97fd986b51a62d6b7feb119e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* iOS: Wrap user's main by renaming symbol and relying on weak linkingTor Arne Vestbø2013-10-171-51/+25
| | | | | | | | | | | | | | | This approach is similar to the earlier apprach of defining main=qt_main when building the user's sources, but uses the linker to rename the symbol instead, which is less fragile than using the preprocessor. To keep the hybrid usecase unaffected by our wrapper logic we declare both our main wrapper and a fallback qt_main as weak symbols, which ensures that when the user's application links in our plugin the real main/qt_main provided by the user is preferred over our weak symbols. Change-Id: Ic76f3ba8932430c4b13a1d3a40b8ed2322fe5eea Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* iOS: Remove check for unknown Xcode versionsTor Arne Vestbø2013-10-141-3/+0
| | | | | | | | We assume new Xcode versions and toolchains won't break anything, just like for toolchains on other platforms. Change-Id: Idb723dbcdbc82e85db1c55b19cd5fe863ca90933 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* iOS: Move qmake features out of the generic features and into the makespecTor Arne Vestbø2013-10-143-0/+169
As they are closely tied to the macx-ios-clang mkspec and can't be shared. Change-Id: Icb59304cc1e4be12732f50175f3f84be289300c2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:12:07 +0000