summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-2711-77/+37
|\ | | | | | | Change-Id: I04afffdce6b78856d0301eb583f21d334c7466b0
| * Remove duplicated documentation from package_manifest.prfJoerg Bornemann2018-11-221-28/+1
| | | | | | | | | | | | | | | | | | | | Descriptions for WINRT_MANIFEST's subkeys are in the documentation. Having a copy in the prf file is superfluous and is likely to run out of sync at some point. Change-Id: Icea49854981990139305f6dc4e73d1b9dcb01dd5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * integrity: don't mess with QTPLUGIN.platformsOswald Buddenhagen2018-11-214-6/+0
| | | | | | | | | | | | | | | | | | | | | | this is an exclusively user-controllable variable. the mkspec may provide a default via QT_QPA_DEFAULT_PLATFORM when it deviates from the platform default known to configure, and these specs actually already make use of that. Change-Id: I7531063d4c404ebed7b2cc1647c61626db30daef Reviewed-by: Kyle Edwards <kyle.edwards@kitware.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * wasm: fix qpa plugin build system integrationOswald Buddenhagen2018-11-212-15/+0
| | | | | | | | | | | | | | | | | | | | | | fix the plugin name (it was missing the leading 'q') and the name used in configure (the latter making it unnecessary to mess with it in the mkspec). the qt.prf override which forced linkage of the plugin is also removed due to being completely redundant. Change-Id: I94687a34a295c36754e36a298af902b656ba2ecc Reviewed-by: Kyle Edwards <kyle.edwards@kitware.com> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * wasm: fix qmake variable names for optimization flagsOswald Buddenhagen2018-11-211-2/+2
| | | | | | | | | | Change-Id: I43c0a94312504948c0db390994656d5f655c8d4c Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * wasm: remove seemingly pointless -s flagsOswald Buddenhagen2018-11-211-8/+0
| | | | | | | | | | | | | | | | these libraries are handled by the configure system. i presume this to be an artifact of an early version. Change-Id: Ieee0554163a9fe296097d09e60a70719beee97b4 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * wasm: fix location and language of commentOswald Buddenhagen2018-11-211-3/+2
| | | | | | | | | | Change-Id: I7c9c65d037f808371a778e51d0877ed579ae8b26 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * configure: fix bogus message about not needing to install qtOswald Buddenhagen2018-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when building additional modules against an already installed qtbase, $$[QT_INSTALL_PREFIX/get] is obviously the same as $$[QT_INSTALL_PREFIX], so we would misdiagnose a non-prefix build. instead, use the same condition as qt_build_config.prf (we cannot just rely on what it sets, because in qtbase configure context it's evaluated before we set up the paths). Fixes: QTBUG-60541 Change-Id: I37be30e0e682ece76ed460a66f1984ee0fe2ed71 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * configure: log -I and -L before doing first library checkOswald Buddenhagen2018-11-212-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for debugging purposes. this needs to work in every configure run even though the options (currently) come from qtbase's global scope. this is accomplished by automatically injecting the test type dependencies declared in the 'builtins' scope (where they generally make no sense whatsoever, because there are no tests there) into other scopes (the first one that has a test of the particular type, specifically). we do that *after* the scope's own test type deps, so it can do its custom stuff first (it can explicitly activate the required features if it depends on some global stuff). Change-Id: I67317da1b55804d39458bdbcf13d39a3e57a13bf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qmake: prune dead assignments from android specOswald Buddenhagen2018-11-212-5/+0
| | | | | | | | | | Change-Id: Ide2bbe7116c24c6b952db835c23ebf2859f18c5f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * qmake: fix test for $ANDROID_NDK_ROOTOswald Buddenhagen2018-11-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | there is no reason whatsoever to ignore the variable if it's set to an invalid value. also, it being empty would lead to a warning from qmake since a while. so instead check it for emptiness like every other variable, not for file existence. Change-Id: I1119f67520d2986811501cd3f223f8f4a87d067d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-11-228-65/+34
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdir.cpp src/corelib/kernel/qtimer.cpp src/corelib/kernel/qtimer.h Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f
| * Add makefile target to generate Xcode projectTor Arne Vestbø2018-11-201-0/+7
| | | | | | | | | | | | | | | | | | | | Removes need to manually build up qmake command line when there's already a Makefile generated (from a recursive qmake_all run e.g.) Instead, just run 'make xcodeproj'. Change-Id: Ibe91b183230721a4bcaddfde53b623df00f7adb5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Android: Prepare for the worst, when the NDK will remove all GNU toolsBogDan Vatra2018-11-193-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | In NDKr18 Google removed GCC, most probably the massacre will not end there and they will remove all GNU tools, so we need to start using LLVM ones. This patch still keeps the compatibility with GNU tools if the Qt was built with android-g++ mkspec. Change-Id: Ibe1979577e08ce63604d55fc5bbd5f64b3737675 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Remove support for qml1 plugins and modulesKai Koehne2018-11-154-55/+8
| | | | | | | | | | | | | | | | | | | | The Qt Quick 1 module got dropped in Qt 5.6, and almost certainly doesn't compile anymore. Change-Id: Ia1ae6937e9cc4d99508be8eeeff9b12d0f001002 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Enable users to specify WindowsTargetPlatform[Min]Version in VS projectsJoerg Bornemann2018-11-166-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][qmake] Introduced the variables WINDOWS_TARGET_PLATFORM_VERSION and WINDOWS_TARGET_PLATFORM_MIN_VERSION for overriding the default values of WindowsTargetPlatformVersion and WindowsTargetPlatformMinVersion in Visual Studio project files. The code to determine the default values is moved to qmake feature files. A common/windows-desktop.conf file is introduced for variables common to all non-UWP Windows mkspecs. The package_manifest feature uses WINDOWS_TARGET_PLATFORM_VERSION as default value for WINRT_MANIFEST.minVersion, and WINDOWS_TARGET_PLATFORM_MIN_VERSION for WINRT_MANIFEST.maxVersionTested respectively. Task-number: QTBUG-53654 Change-Id: I251ec7f9b804c9bc9f7d571f5b43d52b2a2d99d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 13:41:22 +0000