summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* iOS: Skip modules that don't build yetTor Arne Vestbø2013-04-081-0/+1
| | | | | | Change-Id: Ic0f39d7fb5a7f435f31dc6897a0a9266d1d7b0ef Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Enable C++11 on OSX when using ClangTor Arne Vestbø2013-04-051-2/+2
| | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-1/+1
|\ | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| * make the libexec default on windows bin/ after allOswald Buddenhagen2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | the dlls being in lib/ is kind of an accident (a side effect of how qmake builds them). in fact, the libdir should be entirely irrelevant for windows deployments (and indeed, the SDK is delivered with dlls only in bin/). Change-Id: If47e72b24774721a61ba63847f6132f88ff110be Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Ensure GCC prints its messages in English when we parse themThiago Macieira2013-04-021-1/+1
| | | | | | | | | | | | | | | | | | We're trying to parse GCC output, so let's make sure that they are in English. I've seen some reports that "search starts here" was translated to some locales. Change-Id: If09b1f45607f65d054496db65418e413b8aa8d48 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | don't try to de-duplicate QMAKE_DEFAULT_{INC,LIB}DIRSOswald Buddenhagen2013-04-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | the de-duplication has the side effect of sorting, which is a very bad idea: x-compilers tend to append the host library paths at the end, and we really want them to stay at the end. and the lists should have no duplicates to start with. should we find a compiler which breaks this assumption, we can use qmake's $$unique() strategically. Change-Id: I01560e3c33736c2dfffdb05d5c960c492439c946 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Revert "eglfs: Disable eglfs when evdev is not present"Michael Brasser2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | evdev support in eglfs is now guarded by QT_NO_EVDEV, so this check is no longer required. This allows eglfs + tslib to be a supported combination. This reverts commit a95e396a83930de14c6964dbf3724d6162d8400b. Change-Id: Icf7c15121b7eca1131d412b05b956cd5d7f189ae Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Allow tslib to be specified at configure time.Michael Brasser2013-03-261-0/+20
| | | | | | | | | | Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Make sure that we check that pkg-config knows sqlite3 before using itThiago Macieira2013-03-251-1/+1
| | | | | | | | | | | | | | | | Otherwise, we end up with an empty QT_LFLAGS_SQLITE and the plugin won't link. Change-Id: I026f60bf9cd075218dbe2888fbb7fc82782b27ca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Suppress warning about xkbcommon unless we're building XCBThiago Macieira2013-03-231-2/+2
| | | | | | | | | | | | | | | | | | I don't need that warning on my Mac. Change-Id: I18c06135ba88a037103fdda0982976f4a87c553e Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add support for the Clang compiler bundled with XCodeThiago Macieira2013-03-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since c45595d64831990311f92fcebc4e34e2797f5352, we use the toolchain based on the XCode SDK, not the one in $PATH. Turns out that the Clang that comes bundled with XCode 4.6 reports its version as Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn) Instead of "Apple clang". So we need to match for (clang|LLVM). Extended regular expressions (with -E) were necessary because the sed that comes with Mac OS X is apparently broken and will not work with \(clang\|LLVM\). GNU sed accepts -E as an alias for -r, meaning extended regexps. Change-Id: I5a15de30721216b086c3d39a080cc6496c503985 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Fix crosscompiling for Android on MacEskil Abrahamsen Blomfeldt2013-03-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no logic in configure to detect compiler capabilities in the host- and cross-compilers separately, so if the cross-compiler has more capabilities than the host compiler, the compilation will break. This was the case for c++11 on Mac, which is supported by the Android cross-compiler but not by default on the host. There is a fix planned to enable c++11 on Mac, so this is a temporary patch to work around the problem by disabling c++11 explicitly until it has been fixed. Change-Id: I2048dc7f63991c97b11b3980ac91292d2c9b7ce4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Merge remote-tracking branch 'gerrit/release' into stableSamuel Rødal2013-03-211-21/+21
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
| * pass module version to syncqtOswald Buddenhagen2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is cleaner than having it parse qmake project files. the only remaining built-in version extraction is the fallback to qglobal.h needed for bootstrapping. as a "side effect", this fixes the build of modules with mismatched versions centralized in .qmake.conf, as this was simply not handled so far. the -mkspecsdir syncqt option goes away, as there is no use case for it any more. Task-number: QTBUG-29838 Change-Id: I6912a38f0e93a26bc267a9e3d738506fd3ad431b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * add/unify progress messages to/from the configuresOswald Buddenhagen2013-03-151-1/+3
| | | | | | | | | | | | | | | | it's weird that the output from the two variants is differing, and that after building qmake it appears to hang. Change-Id: I2ac3ace11e958effe787b13e1300eb1d2839ae98 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix all "qt style yes options" which start with -lOswald Buddenhagen2013-03-151-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7de9d3709 broke them, because suddenly every -l* switch was parsed as a library. fix this by re-arranging how the options are parsed. this obsoletes d7ab351cdd as well, by being more generic. fwiw, this syntax is stupid to start with, because all unknown -l* options are implicitly libraries and create confusing configure failures. emulating the compiler/linker command lines isn't such a great idea ... Task-number: QTBUG-29174 Change-Id: I11bac7a6f458664dff8cbe57ed9cd33a08d5e9ec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * allow passing values with spaces to -device-optionOswald Buddenhagen2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | note that the value is written verbatim to the qmake file, so additional quoting may be required on the command line. Task-number: QTBUG-30102 Change-Id: I02ca9a44fae82b6932982e6385508b8a304cc1e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add check for libxkbcommon to the configure scriptGatis Paeglis2013-03-191-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is needed for implementing the shortcut functionality in the xcb platform plugin and for the compose key input context plugin. As announced on the wayland-devel mailing list - the libxkbcommon 0.2.0 is the first grown-up release of the library (Tue Oct 23, 2012). [1] [1] http://lists.freedesktop.org/archives/wayland-devel/2012-October/005976.html Change-Id: Id5d45e1a5afe49cf9ec5312318bd173f5a067f62 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Detect Clang availability on Mac based on the SDK, not the OS X versionTor Arne Vestbø2013-03-141-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | Since we use the Clang from Xcode's toolchain now, the OS version is not relevant. In practice this means we will use clang for Xcode 4.2 and up, which means it's possible to use clang also on Mac OS 10.6 (Snow Leopard), where Xcode 4.3 is not available. Change-Id: I9817e237cdd82d10b93aaaa3c90e35767cdca751 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Use tools from the SDK's toolchain instead of the ones in /usr/binTor Arne Vestbø2013-03-131-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Teach configure's pro-file parser to understand host_build scopesTor Arne Vestbø2013-03-131-2/+8
| | | | | | | | | | | | | | | | Is needed now that we write QMAKE_MAC_SDK with a !host_build scope in qdevice.pri. Change-Id: I298cc660b496460190337c175aef684a5522d5cb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Fix build of host_build when a -sdk was passed to configureTor Arne Vestbø2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | qdevice.pri is not target/host specific yet, so we were loading it and overriding QMAKE_MAC_SDK to iphonesimulator eg., even for host tools such as moc. Change-Id: I10277e60e1da84dda239e32a6f19b40dc48f084a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-061-4/+21
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-051-4/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
| | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-02-281-1/+1
| | |\| | | | | | | | | | | | | Change-Id: I6b49d5e1c31599b5aa4940b798533b17e58616bf
| | | * Remove extra $ in default libexec directoryEskil Abrahamsen Blomfeldt2013-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Produces qt_lbexpath=$PREFIX/29677QT_INSTALL_LIBEXECS_DIRNAME in qconfig.cpp Change-Id: Ie6f208d759a748dfcd4f1547943a1dfb4b7aedd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * | Make -force-debug-info option workPaul Olav Tvete2013-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be applied to Qt modules. Not interesting for third party users. Change-Id: I8fce821af397e3ace011a426c762319f6d30004f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * | FIX: misleading -(no)make option in configure --helpRichard Brinkman2013-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify in the configure --help documentation that the text between parentheses in the -make option indicates the default parts, not all the parts that can be chosen from. Task-number: QTBUG-28826 Change-Id: Iac9cf294b8054823ecfaf262aeafab7779ce4c8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | ADD: -confirm-license option in output of configure --helpRichard Brinkman2013-02-221-0/+3
| | |/ | | | | | | | | | | | | | | | | | | Task-number: QTBUG-25185 Change-Id: I1578a023a8b4c030aaf4cd191203d5c28b950a0b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * add -skip option to the configuresOswald Buddenhagen2013-02-201-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it possible to exclude modules from the build without moving their sources out of the way. substitutes the much-requested -no-webkit. not adding a symmetrical option, as it is relatively pointless: to build only specific "leaf" modules, you only need to run "make module-qt<module> ..." once you configured. and removing particular "intermediate" modules is achieved with this very option. Task-number: QTBUG-26697 Change-Id: I25cebdbd029885a2c653c4cde696f9bb78691768 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Disable AVX for the whole Apple Clang 3.x series, not just 3.0Tor Arne Vestbø2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Version 3.1, shipped with Xcode 4.3, has the same issues compiling Qt's AVX code. Change-Id: Icb778fbd9d61f01aa84365661af050c9442d4d7f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Rename configure's getQMakeConfN functions to more descriptive namesTor Arne Vestbø2013-03-051-9/+9
|/ / | | | | | | | | Change-Id: I2f0ad6c3978c4bbb20d6d5b854b5f49e9bb96d2b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Introducing the Qt Android portPaul Olav Tvete2013-03-051-6/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the Necessitas project by Bogdan Vatra. Contributors to the Qt5 project: BogDan Vatra <bogdan@kde.org> Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> hjk <hjk121@nokiamail.com> Oswald Buddenhagen <oswald.buddenhagen@digia.com> Paul Olav Tvete <paul.tvete@digia.com> Robin Burchell <robin+qt@viroteck.net> Samuel Rødal <samuel.rodal@digia.com> Yoann Lopes <yoann.lopes@digia.com> The full history of the Qt5 port can be found in refs/old-heads/android, SHA-1 249ca9ca2c7d876b91b31df9434dde47f9065d0d Change-Id: Iff1a7b2dbb707c986f2639e65e39ed8f22430120 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Teach configure's pro-file parser to parse quoted $$system()Tor Arne Vestbø2013-03-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | If the command is quoted, it can contain anything but quotes (we do not support escaped quotes, so single quotes have to be used). If the command is unquoted we look for the first closing parenthesis. We used to do this using .*?, but the greedy modifier '?' didn't seem to work, so we now use an inverse character set. Change-Id: I40660ce7aef6a6b6d480292d28da1b079bb161da Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Pick up QMAKE_MACOSX_DEPLOYMENT_TARGET from mkspec when building qmakeTor Arne Vestbø2013-03-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of setting it explicitly to 10.6. Before 736e4258a this was not a problem, as we were hard-coding the version flags as part of the C/CXX_FLAGS for each makespec, so getQMakeConf would pick them up automatically. When 736e4258a introduced sdk.prf as the place to resolve these flags in a single place, it broke the qmake build for macx-clang-libc++, as we were then falling back to the 10.6 target hard-coded in configure. We fix this by duplicating some of the logic from sdk.prf, by pulling out the QMAKE_MACOSX_DEPLOYMENT_TARGET variable and adding to the C/CXX_FLAGS. Change-Id: I04afc7525031727c2504588c70dd3f7892cc8e42 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add the infrastructure to compile Qt with -WerrorThiago Macieira2013-02-281-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | This is enabled only for -developer-builds and only for certain compiler-version combinations that are in a whitelist. It also requires each library, plugin or tool to declare whether it is supposedly clean of warnings. When most targets are clean, we can consider inverting. Change-Id: I17b5c4e45aee5078f9788e846a45d619c144095a Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge branch 'ios' into dev" into refs/staging/devTor Arne Vestbø2013-02-281-1/+8
|\ \
| * | iOS: Disable NEON until LLVM handles the GAS syntax of the draw-helpersTor Arne Vestbø2013-02-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LLVM version in Xcode 4.5 and below does not handle the GNU assembler syntax in the pixman assembly file. A possible alternative workaround is to include a preprocessed assembly file using https://github.com/hollylee/gas-preprocessor. Change-Id: Id95add669c60d3a7da823e5975afdd1f88f71977 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * | iOS: Force static builds so that apps can be submitted to the App StoreTor Arne Vestbø2013-02-261-0/+6
| | | | | | | | | | | | | | | Change-Id: I66c917e98e40c07ae9532c106ee1c47caa61abd5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | Stop using function deprecated in D-Bus 1.2 (raise minimum version)Thiago Macieira2013-02-271-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dbus_watch_get_fd function was deprecated in D-Bus 1.2 (technically, in 1.1.1, but that was a development release) because it had a bad name. Sockets on Windows have file descriptors, but they are not shared from the same pool as the CRT library's file descriptors. This commit raises the minimum required version of D-Bus to 1.2. This is the first requirement raise since this code was introduced in 2006. For some reason, the D-Bus 1.2.0 release seems to be missing, but 1.2.1 was released on 04-Apr-2008. That's ancient enough for all distributions Qt 5 is supposed to run on. Change-Id: Ia6bbc137fffbb27c77290ed3e32d3380f0ae3c54 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | Fix DEFAULT_LIBDIRS detection on WindowsRay Donnelly2013-02-221-1/+3
| | | | | | | | | | | | | | Must use ; as the path delimiter instead of : Change-Id: I549e1652ef5bbae09c8fddec3e83ac9f52cec3a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-201-0/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/unix/separate_debug_info.prf src/gui/kernel/qwindow_p.h src/plugins/platforms/cocoa/qcocoacursor.mm tests/auto/tools/moc/tst_moc.cpp Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
| * add QT_CONFIG's static/shared to CONFIG on startupOswald Buddenhagen2013-02-181-0/+2
| | | | | | | | | | | | | | | | | | ... instead of as a fallback in default_post. it was this way in qt4, and it requires less code to be written in the end. we are already doing it for debug/release as well. Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Unify win32-g++ and Unix qmake Makefiles.Ray Donnelly2013-02-191-13/+59
| | | | | | | | | | | | | | | | | | Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Clean up how we build against SDKs on Mac OSTor Arne Vestbø2013-02-191-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-181-2/+8
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-2/+8
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
| | * Place libexec binaries into lib folder on WindowsKai Koehne2013-02-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default libexec directory to 'lib' on Windows for default configurations. This makes sure that e.g. qtwebprocess can actually find & load the right Qt libs. A separate libexec directory was introduced to avoid conflicts between a system-wide Qt in PATH and a custom Qt installation. However, since there are no system wide Qt installations on Windows this isn't an issue, but getting the executables to find its Qt libraries is. Alternatively we could have also placed it in the 'bin' directory. However, putting it in the 'lib' folder carries the notion that, unlike the binaries in the bin, the libexec executables might have to be deployed with a target application. The exception is when a separate archdata prefix is specified, and $$archdata/lib won't contain Qt libraries. In this case we use libexec like on the other platforms too. ChangeLog: [Qt for Windows] Fixed launching of QtWebProcess.exe by changing default libexec directory to 'lib'. Task-number: QTBUG-29661 Change-Id: Icbb15fb98474d6fef8ac9310f2e2b482d3282f79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Ensure that arch.test for host runs with option(host_build)Tor Arne Vestbø2013-02-181-2/+2
|/ / | | | | | | | | | | | | | | | | So that mkspecs and features may rely on the host_build test. Change-Id: I18fee4820d9e2904285afcc7ddb8f1cc3d025fef Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | configure: Verify makespec before using it furtherTor Arne Vestbø2013-02-171-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | The chosen makespec may spit out errors for various reasons, which will influence steps such as detecting pkg-config or the architecture test. It's preferable to catch any issues with the makespec as early as possible and exit configure before the errors propagate to tests. Change-Id: Iecbf3217c36dea9f5e0677c58171b72cb6ce1e0b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 18:36:10 +0000