summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-133-0/+56
|\ | | | | | | Change-Id: I5dbdc13c6133e5b03e362c5461b4a599d781bd1e
| * macOS: Disable main thread checker for Xcode test targetTor Arne Vestbø2018-11-121-0/+1
| | | | | | | | | | | | Change-Id: If9bf63a94b8f2ca1846a502879af5bada9918cd7 Fixes: QTBUG-71636 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * Add Windows Desktop arm64 target to QtbaseThomas Miller2018-11-112-0/+55
| | | | | | | | | | | | | | | | | | Allows a qt build to be configured to target arm64 desktop apps cross platform and build them with nmake. Change-Id: I99fed12047b45a504a1644201bcc19b18c69f3e6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-11-104-9/+17
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/serialization/qcborcommon.h src/corelib/tools/qlocale_data_p.h tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: Ibed987f6d77a0294f78f67d78625237616082416
| * Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-11-091-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf qmake/Makefile.unix src/gui/text/qtextdocument.cpp src/gui/text/qtextdocument.h Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9
| | * mkspecs: use cross compile tools with LTCGSamuli Piippo2018-11-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | AR and NM have different tools when LTCG is used, override those also when cross compiling. Fixes: QTBUG-71595 Change-Id: I5347bd1874688dd89395c50ff6dd08fb1c0ebab1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12.0Liang Qi2018-11-052-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoaglcontext.mm src/plugins/platforms/xcb/qxcbscreen.h Change-Id: If9b4c67288396ff7346088ce591c7a3588b51979
| | * macOS: Only detect changes to the SDK version within the same developer dirTor Arne Vestbø2018-10-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to inform the user when they have upgraded their Xcode version and hence have a new SDK version, which requires a complete rebuild. Explicit changes to the Xcode selection (be it via xcode-select or $DEVELOPER_DIR) do not affect the existing build directory, so we must record the Xcode selection inside the build to avoid false triggering. Change-Id: I7d13da1232226712a4951e8a360cf4b634c6fa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | macOS: Explicitly define lower bound for supported SDK versionTor Arne Vestbø2018-10-262-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to support apps building against the 10.13 SDK, so that they can opt out of dark mode and layer-backing. This does not mean we can't require 10.14 to build Qt itself, but doing so should not require the app to also build against the 10.14 SDK. Change-Id: I53bd0fc8bf56c0be6614acec14d5173589e2620f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | configure: Add switch for adding coverage infoRobert Loehning2018-10-312-0/+11
| | | | | | | | | | | | | | | Change-Id: If6f3d4f29233206ef911f48e63872d28bf7b8e71 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-10-255-5/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qpropertyanimation.cpp src/gui/image/qicon.cpp tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
| * | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Qt Forward Merge Bot2018-10-201-2/+2
| |\ \ | | | | | | | | | | | | refs/staging/5.12
| | * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-211-2/+2
| | |\| | | | | | | | | | | | | Change-Id: Iaf28977e7ecf566b28b9406dcb005d48621169c2
| | | * qmake: Remove the extra space before -MTAndy Shaw2018-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the extra space before -MT ensures that the vcxproj generator gets valid input. Change-Id: Iccf88c5fc4473db406d714b646185a4fb60a3418 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | Fix building tests with -no-guiJüri Valdmann2018-10-201-2/+2
| |/ / | | | | | | | | | | | | Change-Id: I37307080e5adc334fcfcdd2fee650d675228a746 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-10-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platformthemes/platformthemes.pro src/printsupport/kernel/qplatformprintdevice.cpp Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
| | * Bump copyright year in executable metadataKai Koehne2018-10-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I67d06eae963c7fbbbbf13c5f9ab1195cbc5d7eb1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Automatically pick up dependencies.json file for qmlplugindumpKai Koehne2018-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dependencies.json file allows to tweak the list of imports the module is depending on, so that types implicitly imported are not listed twice. Task-number: QTBUG-70264 Change-Id: I7a3800e5ea713a8aaae0cddbf4e1607f92c41497 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | qmake: Add support for CONFIG += c++17Kai Koehne2018-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct name is c++1z. Anyhow, this is easy enough to get wrong, so make sure CONFIG += c++17 works as well. Task-number: QTBUG-67527 Change-Id: Iea26b18824b38b1b5170f85987cf5c750b8e10ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-131-1/+5
|\| | | | | | | | | | | Change-Id: I2715ee7c694e5579bcedc7bab0ae68e79d5fd0b6
| * | Android: fix compile with NDK r18+BogDan Vatra2018-10-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In NDK r18, libc++.so was renamed to libc++.so.XX where XX is the Android API level. [ChangeLog][Android] Fixed build issue with NDK r18+. Task-number: QTBUG-70631 Change-Id: Id0d2955648197e3054e3c69263b5a90d57964f6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Revert "qdoc: Add default include dirs to qdoc command line"Martin Smith2018-10-091-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4bdd8d4ecac42be9e93faa7a2b9ae3448c4f989e. It contains an error. Change-Id: I51052029f001b9e82c2a53de15b4ba354aafdbae Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-10-082-7/+5
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qstylesheetstyle.cpp Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad
| * | macOS: Only verify the major and minor version of the platform SDKTor Arne Vestbø2018-10-031-2/+4
| | | | | | | | | | | | | | | | | | Change-Id: I8de6c06e8be09483591efdf37c1631134d4ef826 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | macOS: Bump the SDK version we've tested with to 10.14Tor Arne Vestbø2018-10-032-5/+1
| | | | | | | | | | | | | | | Change-Id: Ibfdb8be91be46b22e0f0b97105121176a02a8576 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | waylandscanner: use --include-core-onlyJohan Klokkhammer Helsing2018-10-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to ship our own version of wayland.xml protocol code we need to get rid of all includes of system versions of wayland-client-protocol.h and wayland-server-portocol.h. These were unfortunately included by wayland-client.h and wayland-server.h and now can't be removed because of compatibility issues. To solve this, wayland-client-core.h and wayland-server-core.h can be included instead, which don't include any generated protocol code. Again, due to compatibility concerns, wayland-scanner does not use these versions unless invoked with --include-core-only, which is what this patch fixes. Task-number: QTBUG-70553 Change-Id: Icf7c870bd4d5bf891628cbddce2a9de3dda50164 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | qdoc: Add default include dirs to qdoc command lineMartin Smith2018-10-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change applies to darwin. It adds each include path in the QMAKE_DEFAULT_INCDIRS variable to the qdoc command line with the -I flag for both the prepare and the generate phase. These include paths provide access to the standard c++ and c headers, which clang needs to see. This change should work on all platforms, but it increased the qdoc warning count on the linuxsystem where it was tested, so now it only applies to darwin. Change-Id: I16e2e0d744e2cf68743dc12d39155dda2ece1536 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-291-0/+3
|\| | | | | | | | | | | Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
| * | Revert "Android: Compile with NDK r18 + clang"Liang Qi2018-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This broke the build for qtlocation. This reverts commit 176a216f4f6c36c769e9b667c12717c277a003ca. Task-number: QTBUG-70779 Change-Id: Ifd8419ffb88c1a9009319f39b11b4529b143477e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Export modules' enabled/disabled features to cmakeFriedemann Kleint2018-09-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add properties enabled_features and disabled_features the respective library targets. This makes it possible to query the enabled classes in dependent libraries (for example, Qt for Python). Add a test verifying whether the Open GL configuration is reflected correctly in the feature properties to the existing test_opengl_lib autotest. Change-Id: I645c947073dbb36da3be81de6bc62ee0ba1e73d6 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Android: Compile with NDK r18 + clangEskil Abrahamsen Blomfeldt2018-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In NDK version r18, the libc++.so file we used for clang has been removed. However, in r17 this was actually just redirecting to libc++_shared.so, which is still available in r18, so we can link directly to that instead. [ChangeLog][Android] Fix build issue with Android NDK r18 and clang. Task-number: QTBUG-70631 Change-Id: I658c0cabf49f27a47f38305de3c86067c8b18b25 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-133-4/+7
|\| | | | | | | | | | | Change-Id: Icd201bf6b634e44e0e2ab05eaf91a7d8588d7f05
| * | Merge "Merge remote-tracking branch 'origin/5.11.2' into 5.12" into ↵Qt Forward Merge Bot2018-09-122-3/+4
| |\ \ | | | | | | | | | | | | refs/staging/5.12
| | * | Merge remote-tracking branch 'origin/5.11.2' into 5.12Qt Forward Merge Bot2018-09-122-3/+4
| | |\| | | | | | | | | | | | | Change-Id: Ic9024fac14ff01154e10aa524293d8e3e7caa021
| | | * syncqt: fix forwarding injected headers, take ~3Oswald Buddenhagen2018-09-122-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in non-prefix builds, the forwarding headers always end up in qtbase's build dir, while the injected headers always live in the build dir of the module they belong to. to deal with that, we now record the target path relative to the module root dir instead of relative to the base directory of the forwarding header itself. Fixes: QTBUG-70056 Change-Id: Ic4346148a125b13e2610f6965cdf4f5266ac763e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | winrt: Fix build with MSVC >= 15.8Oliver Wolff2018-09-121-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 39cb9ac873cc moved the _ENABLE_EXTENDED_ALIGNED_STORAGE define from msvc-version.conf to msvc-desktop.conf which basically removed the define from winrt builds. By adding it to winrt's common qmake.conf these builds are fixed. Change-Id: I3d87c55fb52685859713f7466012b45c46145678 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-113-0/+51
|\| | | | | | | | | | | Change-Id: I1df9adea124326ef7c7802839eb93efc4302b287
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-103-0/+51
| |\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/macx.conf Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
| | * macOS: Warn the user when using incompatible or untested platform SDKsTor Arne Vestbø2018-08-312-4/+38
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-70263 Change-Id: Ic946d1efc69ebb8ba65bbba956ed55ab7183957e Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | * macOS: Detect changes to the platform SDK and ask the user to deal with itTor Arne Vestbø2018-08-312-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the SDK upgrade (or downgrade) may subtly and silently affect the resulting binary, or if it results in build breaks, the user won't know why. We limit it to applications for now, as that's the point where it's most important to catch the SDK upgrade, but technically we should also do this for intermediate libraries. Doing it for everything will likely incur a performance cost, so we skip that for now. Change-Id: I8a0604aad8b1e9fba99848ab8ab031c07fd50dc4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-061-1/+1
|\| | | | | | | | | | | Change-Id: I2f6e1c0f649c5098723b776c774a8a689bb60582
| * | Allow passing custom arguments to qmlplugindumpKai Koehne2018-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QMAKE_QMLPLUGINDUMP_FLAGS variable that allows plugins to set qmlplugindump options like -app, -noforceqtquick. The naming follows the example of e.g. QMAKE_LRELEASE_FLAGS. Task-number: QTBUG-70264 Change-Id: I1d11b7f3b03fab79ab9e06188cecf31650789302 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-026-3/+367
|\| | | | | | | | | | | Change-Id: I33e0abc771a2a772d3334172d50e7b0efe896590
| * | Remove codepaths and checks for unsupported Apple platformsTor Arne Vestbø2018-08-311-2/+0
| | | | | | | | | | | | | | | | | | | | | We no longer support macOS 10.11, iOS/tvOS 10, or watchOS 3. Change-Id: Ide03d8fac06185ef4162ba75ee54a0adf6916905 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * | WebAssembly for QtBaseMorten Johan Sørvig2018-08-305-1/+367
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the squashed diff from wip/webassembly to dev. Done-with: Peng Wu <peng.wu@intopalo.com> Done-with: Sami Enne <sami.enne@intopalo.com> Done-with: Morten Johan Sørvig <morten.sorvig@qt.io> Started-by: Andrew Knight <andrew.knight@intopalo.com> Change-Id: I6562433c0a38d6ec49ab675e0f104f2665f3392d Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | add mkspecs for linux clang 32Eric Lemanissier2018-08-314-0/+110
|/ / | | | | | | | | Change-Id: Ia0ca4d84070565f1f4f19415931ca4ee0d7cf138 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix qtbase build for clang-cl with MSVC 2017 15.8Friedemann Kleint2018-08-243-8/+3
| | | | | | | | | | | | | | | | | | | | Move the definition of _ENABLE_EXTENDED_ALIGNED_STORAGE to msvc-desktop.conf so that it becomes effective for all compilers using MSVC (icc, clang-cl). Task-number: QTBUG-50804 Change-Id: I5ff612cc0f5a712b855925f9bcf645e578e80504 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | iOS/tvOS/watchOS: Bump deployment targetsTor Arne Vestbø2018-08-243-3/+3
| | | | | | | | | | | | | | | | | | | | As planned, we only support the latest and previous release for these platforms, and by the time 5.12 is out these platforms will all have had new releases, so we should bump the deployment target now. Change-Id: Ibbb7d07bb5d9a1007ab37b88d75781be2c1f7075 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | macOS: Bump deployment target (minimum supported version) to 10.12Tor Arne Vestbø2018-08-241-1/+1
| | | | | | | | | | | | | | | | | | As discussed earlier, we don't want to keep backwards compatibility for more than two versions in addition to the current macOS version. Change-Id: I24df6fb4a08e14a9f842d209b8e0a6079c533b65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | macOS: Share deployment target and device arch config between makespecsTor Arne Vestbø2018-08-234-12/+3
| | | | | | | | | | Change-Id: Ie06705590b4962d8b09b97e30625ef11af321763 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 01:32:58 +0000