- 01 Dec, 2014 - 1 commit
-
-
Tor Arne Vestbø authored
Combining them could lead to intermediate builds having cached the path, but not the version, resulting in later version checks failing. Change-Id: Ia10f4268ce7b9e82c81627970236d68c00b80391 Reviewed-by:
Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-
- 11 Nov, 2014 - 1 commit
-
-
Richard Moe Gustavsen authored
Ensure the sdk is of recent enough version since: 1. we build Qt with the latest sdk version, so the app needs to do the same to avoid compatibility problems e.g when linking. 2. using a launch screen to support iphone6 depends on sdk 8 3. Apple requires apps that are pushed to appstore to use the latest version of the sdk. Ideally we should store the sdk version used to build Qt, and require that apps use the same version or newer. But this patch will do until that is in place. Change-Id: I18b06d09c1eda15122975b7169ca7a3372df6054 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-
- 08 Apr, 2014 - 1 commit
-
-
Tor Arne Vestbø authored
Change-Id: I9e9f9b033cc892a35c86b35f64dc1dd915ad44f3 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by:
Eike Ziller <eike.ziller@digia.com> Reviewed-by:
Jake Petroules <jake.petroules@petroules.com> Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-
- 14 Nov, 2013 - 1 commit
-
-
Oswald Buddenhagen authored
as this new cache category comes without side effects, we can unconditionally create a cache whereever we are. this allows us to be performant without explicit user action. Task-number: QTBUG-31340 Change-Id: I6b88b20b61e8351aa8cbf94ad3eec65adac6e1d6 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 24 Jun, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
Otherwise doing stuff like -spec macx-g++ when the default spec is clang will not have an effect on the tools used. Change-Id: Ia2769abfdd8c19f79d427b9f09707430e736305a Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 08 May, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
The Xcode and SDK settings are expensive to resolve, as we're using system() calls to resolve them. We now try to detect the presence of a .qmake.cache file (and inform the user that creating one would be a good idea), and use the file to cache the various settings after resolving them. The Xcode logic had to be moved form xcode.conf as part of the mkspec, into default_pre/post.prf, so that we could cache() the resolved values. Task-number: QTBUG-30586 Change-Id: Ib5368cfee6f7e4a4a33f6be70d0e20d96896fe56 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 18 Apr, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
We now use an absolute path, to prevent picking up the wrong plutil binary. In addition we pipe the possible stderr output of plutil and xpath to the null device, so that the final QMAKE_MAC_PLATFORM_NAME will be empty in case of any errors, and caught by the isEmpty() check below. Change-Id: I8ad24bf63162a76410c2ae223dd2fc48e7886bbf Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 09 Apr, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
We always use the xcodebuild/xcrun/xcode-select binaries in /usr/bin, as these will dispatch to the right binary based on what Xcode version has been chosen using xcode-select -switch. This fixes an issue where a tool was in the path from another Xcode installation. We can rely on the tools as they are present on a clean Mac OS install. Change-Id: I1d3cc1e92604f9be6d6f14639cb6322234edd696 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 08 Apr, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
xcrun will spit out errors to stderr and nothing to stdout if it fails to find the tool in question. By checking for an empty return value and skipping the sysrooting we guard against mangling the tool variable. Change-Id: I68f59a6c8116696dd75cceed7b33ac666f3468b2 Reviewed-by:
Eike Ziller <eike.ziller@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 05 Apr, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
This means we have to bump the deployment target to Lion (10.7), as the LLVM 'libc++' C++ standard library does not support Snow Leopard (10.6). For iOS the deployment target has to be bumped from 4.3 to 5.0, but we don't enable C++11 by default yet as it's not tested enough on iOS. Users who wish to deploy to 10.6 need to build their own Qt, passing -no-c++11 to configure. Change-Id: I7b5d20ab002db889d1091a4b7ff600f62caa7f06 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
- 13 Mar, 2013 - 2 commits
-
-
Tor Arne Vestbø authored
For Mac OS X we currently specify build tools without an absolute path, which means we end up using the ones in /usr/bin. This is wrong, we should be using the tools from the toolchain of the chosen SDK. For iOS we do specify an absolute path, by resolving the toolchain path in the iOS makespecs. To solve the situation on Mac OS X, we move the logic of resolving the toolchain path to sdk.prf, and share it between OSX and iOS. For configure we need to duplicate some of the logic from sdk.prf, as configure pulls out QMAKE_CC and QMAKE_CXX for running some initial tests and building qmake. The new macSDKify function also solves the issue of missing sysroot and deployment version in the flags. Change-Id: Ib1d239c9904cf3ccee5214b313cf6205869a1462 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
Tor Arne Vestbø authored
We now take advantage of the fact that xcodebuild -version allows you to pass the key that you're interested in, to only print that single value. This technique is used by Apple's own build scripts as well. Change-Id: I57b8424590d4137a0e7f263a318e17ee2e0dfad4 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by:
Richard Moe Gustavsen <richard.gustavsen@digia.com>
-
- 02 Mar, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
Instead of hard-coding the SDK and deployment target. A host build will already use the host-makespec, so now that we always build against an SDK, these mkspecs will have the SDK and deployment target set. Change-Id: I2b0343ae75f7de12081bab8346307b96b3883f62 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
- 28 Feb, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
We don't want to hit the network, as a flakey network or slow server will hang the XML parsing. We assume the XML is well formed. Change-Id: Idc4898a925a46222954bf633a04ea9fe148c6797 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 27 Feb, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
And use configure's -sdk argument to choose between the iphoneos and the iphonesimulator SDK. xcodebuild -showsdks can be used to list the available SDKs. Passing an SDK without a version postfix implies the latest version of the SDK. Change-Id: I881df754d522fc91aaa16ba3e39cf0c37a21a1f1 Reviewed-by:
Richard Moe Gustavsen <richard.gustavsen@digia.com>
-
- 22 Feb, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
Allows us to dynamically generate the command line option for iOS later, and allows the user to override QMAKE_MACOSX_DEPLOYMENT_TARGET with the expected effect on the command line options. We unset PERL5LIB to ensure we get the system Perl libraries, since the Mac OS 10.6 CI machine seems to have a broken XML::Parser::Expat from macports/CPAN. Change-Id: I04430c7b1daf9452d72f9a04a6b7f8d0d6926884 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 19 Feb, 2013 - 1 commit
-
-
Tor Arne Vestbø authored
Instead of setting -isysroot in both arch.test, compile.test, the various mkspecs, and sdk.prf, we now propgate the chosen SDK as the qmake variable QMAKE_MAC_SDK, which is then handled exclusivly in sdk.prf. The QMAKE_MAC_SDK variable, and -sdk argument to configure, is expected to be of the short-form name, eg macosx or iphoneos, not a full path, as that's what Xcode also expects. We take care of translating that into a full path for -isysroot/-syslibroot in sdk.prf, using xcodebuild as a helper. Change-Id: I281655b2fa5180c6e78ffdce36824e4a91447570 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 27 Apr, 2011 - 1 commit
-
-
Qt by Nokia authored
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
-