summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
...
| | * iOS: Enable fat builds containing both armv7 and arm64 slicesTor Arne Vestbø2014-11-133-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple will from February 1, 2015, require all applications uploaded to the App Store to be built for both 32-bit (armv7/s) and 64-bit (arm64). https://developer.apple.com/news/?id=10202014a We enable fat Qt binaries by passing both -arch armv7 and -arch arm64 to clang, which takes care of lipoing together the two slices for each object file. This unfortunately means twice the build time and twice the binary size for our libraries. Since precompiled headers are architecture specific, and the -Xarch option can't be used with -include-pch, we need to disable precompiled headers globally. This can be improved in the future by switching to pretokenized headers (http://clang.llvm.org/docs/PTHInternals.html). Since we're enabling 64-bit ARM builds, we're also switching the simulator builds from i386 to fat i386 and x86_64 builds, so that we are able to test 64-bit builds using the simulator, but we're keeping i386 as the architecture Qt is aware of when it's building for simulator, as we need the CPU features to match the lowest common denominator. Change-Id: I277e60bddae549d24ca3c6301d842405180aded6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * iOS: Allow ARCHS to be specified at build time for multi-arch buildsTor Arne Vestbø2014-11-131-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building all architectures of a multi-arch build during Qt development is in most cases not needed, so we expose a way to limit the archs we build by passing ARCHS="subset of archs" to make, similar to how you can pass ARCHS to xcodebuild. If the subset doesn't match any of the valid architectures for the target, it will fall back to the default architectures, so it's safe to pass eg. ARCHS="armv7 i386" to make, even if building for both simulator and device. The variable may also be exported to the environment for more persistent limits on which architectures to build. Change-Id: I47b10bc9d743f0301efff4181d6881ae140d557f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * iOS: Ensure that the rename-main logic works for multi-arch buildsTor Arne Vestbø2014-11-133-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to tell Xcode which architectures it should set up pre-link dependencies for, as well as run the rename script in the root object file directory. We pass it the current architectures so that we only rename main() for simulator or device, not both. Change-Id: I095d7c8a22ff0cb2ce872c9a86c93a070c1fcc65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * iOS: let qmake generate default LaunchScreen.xibRichard Moe Gustavsen2014-11-113-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iOS8 will check if the app has a LaunchScreen.xib to determine if it supports iPhone6/6+ (scale factor and resolution). So we follow the same pattern as we do with the launch image for iPhone5, and generate a default LaunchScreen.xib. The xib file in this patch is a copy of a default file generated by a native Xcode project (with quotes escaped), but with the text label set to be $$TARGET. Change-Id: I163ab48b6f4edea4cc1f6840a1f3d8b3cc0326db Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into ↵Jani Heikkinen2014-11-114-3/+23
| | |\ | | | | | | | | | | | | refs/staging/5.4.0
| | | * Merge remote-tracking branch 'origin/5.4' into 5.4.0Oswald Buddenhagen2014-11-104-3/+23
| | | |\ | | | | | | | | | | | | | | | Change-Id: I85e3dfa62f217b76447276dd7cce6b9eac3a144e
| | * | | Add CFBundleIdentifier to the bundle Info.plist'sMorten Johan Sørvig2014-11-108-0/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the current app CFBundleIdentifier support: handle frameworks as well. Add @BUNDLEIDENTIFIER@ placeholder to the OS X info.plist.lib templates. This means the Qt frameworks will now get a valid CFBundleIdentifier entry the same way as app bundles: by extracting the identifier prefix from Xcode settings and appending framework name. Task-number: QTBUG-32896 Change-Id: Ica8f28332a88e37a823c46fca7a2c373157af020 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | Merge remote-tracking branch 'origin/5.3' into 5.4.0Oswald Buddenhagen2014-11-102-1/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Iad9ef6bf7d6111efba8232a7d9b46bb9974912f5
| | | * | Stop including g++-unix.conf in the freebsd-clang mkspec.Raphael Kubo da Costa2014-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the settings there end up overwritten by the clang.conf include that comes afterwards, except for a few things such as QMAKE_LINK_C, which remains set to "gcc" and breaks things when one uses CONFIG=use_c_linker. QMAKE_LFLAGS_NOUNDEF was coming from g++-unix.conf, though, so we now manually set it in freebsd-clang's qmake.conf. Change-Id: Ibd16f59d43eb19e72adf4919da9ce3007100b60f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * | Set the _C variants of QMAKE_LINK and QMAKE_LINK_SHLIB in clang.conf.Raphael Kubo da Costa2014-11-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While it does not look like the clang-based mkspecs had any problems so far with not having QMAKE_LINK_C and QMAKE_LINK_C_SHLIB defined, it makes sense to set them to $$QMAKE_CC just like the GCC-based ones so CONFIG=use_c_linker works as expected. Change-Id: Ib660d12b001dd7a877b6f03e79715db08a272968 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | | | mkspec macx-ios-clang: ensure SDK version is validRichard Moe Gustavsen2014-11-112-0/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Fix release-with-debuginfo flags for QCCMatt Fischer2014-11-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the way that the QCC mkspecs are structured, the recent change to add full optimization support causes the -O2 flag to be completely dropped from QCC builds in release-with-debuginfo mode, since the QMAKE_CFLAGS_OPTIMIZE variable is not declared in any configuration file included by QCC toolchains. This patch adds the necessary flags to make the QCC toolchain operate correctly. Change-Id: I4cd93442d59fae7c92fc5219cddb16f367447203 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * | | WinRT: Add missing manifest specifier for rotationMaurice Kalinowski2014-11-073-2/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Add WINRT_MANIFEST.rotation_preference as description which orientation is allowed or preferred by the app. Valid values for Windows Phone are portrait, landscape, landscapeFlipped. WinRT also allows portraitFlipped Task-number: QTBUG-40830 Change-Id: I6b11afcdb72c2c158dadddafc5d90c1d18ab9d8b Reviewed-by: Andrew Knight <andrew.knight@theqtcompany.com>
| * | Build Qt for OS X and iOS with relative rpathAdam Strzelecki2014-11-012-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defaulting to absolute_library_soname on configure -rpath is no longer necessary as now we support @rpath install name ids on OS X and iOS. This also sets QMAKE_SONAME_PREFIX to @rpath for Qt modules when built with rpath configuration. This makes Qt libraries relocatable on OS X. Qt SDK is not yet relocatable though, because plugin location (including cocoa plugin) is still resolved using absolute path (see QTBUG-14150), also there are several absolute paths hardcoded in qmake mkspecs pri files. Task-number: QTBUG-31814 Change-Id: Ie9dffefcd2a946c1580293d433621c1adb7e06c4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * | Add rpath pointing to Qt libraries in OS X and iOSAdam Strzelecki2014-11-011-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is triggered only when app is using Qt and Qt was built with "rpath" configuration and project does not specify QMAKE_RPATHDIR explicitly. Added rpath is made relative to app binary location if target path lies inside Qt SDK, so all SDK bundled tools and examples will work automatically without any changes. Tests are an exception here, since they are being run from their build location by CI, we may not use relative rpath that work only in install location. Task-number: QTBUG-31814 Change-Id: I3690f29d2b5396a19c1dbc92ad05e6c028f8515b Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * | Reenable C++11 for ICC on OS XThiago Macieira2014-10-311-2/+1
| | | | | | | | | | | | | | | | | | | | | It's fixed for the Intel Composer XE 2015 (compiler version 15.0). Change-Id: I7960b2128743081e905d4b96acf55360f744fc69 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * | Enable the latest versions of GCC, Clang and ICC with -WerrorThiago Macieira2014-10-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with GCC 4.9, Clang from XCode 5.1 and ICC 15 beta. Clang 3.5 (pre-release) cannot compile qtdeclarative yet with -Werror due to invalid C++ code there that calls member functions on null pointers. Change-Id: Ic2845371a1899716985bc0813dfb820fa418e207 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Raspi: default platform plugin is eglfsLaszlo Agocs2014-10-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not wayland. Use the default of eglfs coming from linux_device_pre.conf. Qt 5.4 includes QtWayland and the platform plugin from there may get built unexpectedly. The result is that the Pi setup that worked with 5.3 and eglfs stops functioning. Task-number: QTBUG-40538 Change-Id: If894c7ddd7b40a22272797d94ce1a545b7ab43f2 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * | add support for explicitly declaring the module master headerOswald Buddenhagen2014-10-292-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a module delegates to another module (as the activeqt ones do), it doesn't have a master header to be included. we could derive the real master header by doing a transitive dependency resolution and some filtering, but that seems unnecessarily complex. Task-number: QTBUG-41892 Change-Id: Ie7ce51a837ac06e929b204ec734206c11b3ae241 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Oswald Buddenhagen2014-10-291-1/+4
| |\ \
| | * | Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-10-281-1/+4
| | |\| | | | | | | | | | | | | Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e
| | | * pay attention to the MAKE env variableOswald Buddenhagen2014-10-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to avoid that inherited MAKEFLAGS turn out to be incompatible with the make we choose. Task-number: QTBUG-39527 Change-Id: I47d4cec58b0643cc5d97868e70b24f7f37e964bb Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | iOS: Properly detect arm64 builds when choosing which -arch flags to passTor Arne Vestbø2014-10-281-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Change-Id: Ib410584ba2c1fe342efb18eb955273090d36db8f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Android: Initial support for arm64-v8a, x86_64, mips64 architectures.BogDan Vatra2014-11-182-14/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new default compler is gcc 4.9, it is needed to compile 64 architectures. Change-Id: I7ccbac7615b6dc20f5b0441908590de7d4a2e8cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | | Android: Remove duplicate code, use pre-calculated variableBogDan Vatra2014-10-231-8/+8
| | | | | | | | | | | | | | | Change-Id: I66a7dd2aa9fa67a639b0573641b6bb01ead18d07 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-2011-120/+14
|\| | | | | | | | | | | Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb
| * | embed a VERSIONINFO resource into Qt pluginsJoerg Bornemann2014-10-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts f0ee55c00. VERSION actually makes sense on Windows, because it embeds a VERSIONINFO resource into the DLL that can be inspected by the user. Task-number: QTBUG-37961 Change-Id: I6b81b5aa999eba16cb8d9a4d61bd596310af46b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Bump default deployment target to 10.7Morten Johan Sørvig2014-10-188-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | 10.6 is no longer supported. Change-Id: I4c799ba2a9622aa1dd8a79ff70608b50b2bbd26a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * | Remove duplicate of clang + libc++ mkspecJürgen Hunold2014-10-102-112/+0
| | | | | | | | | | | | | | | | | | | | | | | | The same funcionality is already supported, so we avoid confusion. The corresponding mkspec is name "linux-clang-libc++" Change-Id: Ib087595298b48c73ad5da8d92cca2d1bac89f2be Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-0923-29/+65
|\| | | | | | | | | | | Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
| * | WinCE: fix DLL build errors with CONFIG+=consoleJoerg Bornemann2014-10-085-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit cd1dff75, we use QMAKE_LFLAGS_CONSOLE when linking DLLs that are built with CONFIG+=console. Thus, we must not pass options that are specific to linking executables. [ChangeLog][qmake] WinCE makespecs must not add /ENTRY: to QMAKE_LFLAGS_CONSOLE and more. The flag is hard-coded in console.prf now. This is a side effect of making it possible to specify a subsystem for DLLs. Change-Id: Ib481fd45b12140f9f05bf123db7152a3ddf0fa04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Oswald Buddenhagen2014-10-0713-8/+36
| |\ \
| | * | Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-10-0613-8/+36
| | |\| | | | | | | | | | | | | Change-Id: I132bb6cce68e9f8413200f7ee75586bd1cada38c
| | | * fix parallel installation of private and qpa headers in qt framework bundlesOswald Buddenhagen2014-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with qmake now de-duplicating the paths properly, we should version these QMAKE_BUNDLE_DATA entries as well, so we don't depend on the symlinking of the regular headers being done first. Change-Id: Idaa2ccc1ba9b5684b0c8d84f7f760735f54432e1 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | | * Add CFBundleVersion to the Info.plist files.Morten Johan Sørvig2014-10-019-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @FULL_VERSION@ -> Qt version substitution to unixmake2. This makes the Qt-generated Info.plist files compliant with the bundle signing/validation process. Task-number: QTBUG-32896 Change-Id: I1818f028c2f740d699629dd78cc0fe6ffaf94a1c Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | | * Don't make Info.plist for debug framework bundlesGabriel de Dietrich2014-10-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do so by setting a 'no_plist' config property. Can be overridden with 'force_debug_plist'. The debug version of Info.plist would overwrite the release version, and it also happens to contain invalid data. In particular, CFBundleExecutable would contain the _debug suffixed libname, which it shouldn't. See the entry about CFBundleExecutable on https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html Task-number: QTBUG-32894 Change-Id: Ideb018e4768a7c4e276e1b07d77937451f6db6a2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | | * actually use DIRLIST_SEPARATOROswald Buddenhagen2014-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's QMAKE_DIRLIST_SEP and DIRLIST_SEPARATOR. pure evil. Task-number: QTBUG-41668 Change-Id: Ie2f6db6530e0f50bc1ce5db593180e7ad703766b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | | * create_cmake: Fix mingw plugin pathTimothy Gu2014-09-291-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MinGW static libs use libfoo.a format, and not foo.lib. Change-Id: I899adca8ec0b1c8430f5b6c4f18ad0ea1dc6d398 Reviewed-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | | pass windows/console linker flags to DLLs and executablesJoerg Bornemann2014-10-062-7/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass QMAKE_LFLAGS_WINDOWS and QMAKE_LFLAGS_CONSOLE to QMAKE_FLAGS regardless of the project template. The /SUBSYSTEM linker switch is not exclusively meant for executables but can also be applied when linking dynamic libraries. This is needed when building DLLs for Windows XP with VS >= 2012. Task-number: QTBUG-41504 Change-Id: I5966cba1b6756e15275fa5d7fdbc42b99c95c07b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | iOS: Set up default Info.plist to support all interface orientationsTor Arne Vestbø2014-10-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the UISupportedInterfaceOrientations key is missing, iOS will start up the application in the orientation defined by UIInterfaceOrientation, and if that key is also missing, it will default to portrait orientation. Unfortunately, when the application has finished launching on an iPad, there is no way to re-evaluate the current device orientation unless the user actively rotates the device, so for example if the device is physically in landscape orientation, and the application is started up in portrait, the application will not auto-rotate to landscape after starting up. It would seem that [UIViewController attemptRotationToDeviceOrientation] would be the right API to do this, but even after telling the device to beginGeneratingDeviceOrientationNotifications the device orientation will still match the startup orientation until the device is physically rotated. For iPod/iPhones this is not an issue, as the OS will update the device orientation after startup. Presumably the difference in behavior between the two device classes is due to the iPad supporting any orientation for the application grid. Since we would prefer the application to either start up in the right orientation directly, or at least rotate to it after startup, and the latter can't be done, we apply UIInterfaceOrientationMaskAll to the Info.plist file. This also has the benefit that the application will show any splash screens in the right orientation. Change-Id: If0421bc7b82b7f14a510fa1f34eac4f6407f570f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * | micro-optimization: make use of qtPrepareTool()'s new modeOswald Buddenhagen2014-09-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | avoids that we needlessly initialize QMLIMPORTSCANNER in addition to QMLIMPORTSCANNER_SYS (by making the former have the contents of the latter). Change-Id: Ib8a12975de426ae94bd78d489099157c94cea189 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | use correct quoting style when running syncqt under mingwOswald Buddenhagen2014-09-302-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to this end, add a mode to qtPrepareTool() which prepares the primary variable for system() use (instead of use in makefiles). Task-number: QTBUG-41032 Change-Id: If6aa6c206a70ecdbc2ea05bbb3cb470414fb02b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Add support for gcc/clang's sanitize featuresPeter Kümmel2014-10-023-0/+55
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC and Clang support compiler intrinsic error detections tools: address, memory, thread, undefined Let users conveniently enable it in qmake, for instance with CONFIG += sanitizer sanitize_address Also add a -sanitize [...] option to configure to use it by default for both the Qt libraries, and user applications. [ChangeLog][configure] Added support for GCC/Clang -fsanitize= options Change-Id: Ie5418abcdf41842566df510d7707e41739e66f87 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | create_cmake: Make the warning actually useful.Robin Burchell2014-09-261-1/+3
| | | | | | | | | | | | | | | | Giving instructions, rather than forcing one to grep qtbase for the error message is always a good thing. Change-Id: I0f5abed341368cdf817dc0110c2c250b377a30de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | make -force-debug-info work for objective COswald Buddenhagen2014-09-262-0/+2
| | | | | | | | | | | | Task-number: QTBUG-35776 Change-Id: Idb96108963e9330dd62c7878457c30bd74dc79a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Use the correct QMake spec when running config testsThomas McGuire2014-09-251-1/+1
| | | | | | | | | | | | Task-number: QTBUG-41508 Change-Id: I0f27aad625117f931216b0cee987ed9463b7d0e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Update license headers and add new license filesMatti Paaso2014-09-24136-2570/+1482
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-245-23/+4
|\ \
| * | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-235-23/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The isAlwaysAskOption was removed in 38621713150b663355ebeb799a5a50d8e39a3c38 so manually removed code in src/plugins/bearer/connman/qconnmanengine.cpp Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qcollator_macx.cpp src/corelib/tools/qstring.cpp src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow_p.h src/gui/text/qtextengine.cpp src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h src/plugins/platforms/android/qandroidinputcontext.cpp src/plugins/platforms/xcb/qglxintegration.cpp src/plugins/platforms/xcb/qglxintegration.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp src/testlib/qtestlog.cpp src/widgets/dialogs/qfiledialog.cpp src/widgets/kernel/qwindowcontainer.cpp tests/auto/corelib/tools/qcollator/tst_qcollator.cpp tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
| | * Do not set QMAKE_{INC,LIB}DIR_{OPENGL,X11} in the freebsd mkspecs.Raphael Kubo da Costa2014-08-153-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | X11 and the GL libraries are installed into /usr/local like other software, and this has been the case for many years. Change-Id: Ied4d9d61154014db3861bdbd6a5bdbe68e76f878 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 10:45:57 +0000