summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-154-14/+50
|\ | | | | | | Change-Id: Iad06d8c07dfc288c9d1a9f7ee3520285cea60546
| * Mark ICC 18 & 19 as warning-freeThiago Macieira2018-12-141-3/+4
| | | | | | | | | | Change-Id: I052407b777ec43f78378fffd15311de83f978817 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
| * Fix build with win32-clang-msvc and win32-iccFriedemann Kleint2018-12-143-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbbe8aba9d70a3c13d1cd7797eb4dbbd1f05ade5 introduced a check for MSVC_VER to qmake, which is not set in win32-clang-msvc, causing the build to fail: Mkspec does not specify MSVC_VER. Cannot continue. Unable to generate output for: .../config.tests/verifyspec/Makefile Extract a minimal msvc-based-version.conf which determines MSVC_VER from QMAKE_MSC_VER for win32-clang-msvc and win32-icc. Task-number: QTBUG-63512 Change-Id: Ia6de8c4b1aae2ae1962cf4e60e3e6d51fdbbbabe Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qmake: don't misuse cache()Oswald Buddenhagen2018-12-141-2/+5
| | | | | | | | | | | | | | | | | | | | ... when QMAKE_DEFAULT_{INC,LIB}DIRS cannot be determined. it would have been nicer to actually persist empty results, but cache() won't do that, and fixing it doesn't seem worth the effort now. Change-Id: I95d5645e40a0da572f0def16462703373eaeb804 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * qmake: don't assign fallbacks for QMAKE_DEFAULT_{INC,LIB}DIRS in x-buildsOswald Buddenhagen2018-12-141-1/+1
| | | | | | | | | | | | | | these cannot be possibly correct, and might mislead. Change-Id: Ie10531807978def04768e2429304949415cafb2a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | qmake: enable rtti config option for g++/clangDaniel Wingerd2018-12-134-2/+2
| | | | | | | | | | | | Fixes: QTBUG-26595 Change-Id: Ic996c8e27ef4b79c91c5afa0ad55ef0fc07b6004 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-138-26/+50
|\| | | | | | | Change-Id: I0fe623517af28e408b642c879efd59f633ab63ac
| * configure: fix $$qtConfFindInPath() on windowsOswald Buddenhagen2018-12-121-0/+1
| | | | | | | | | | | | | | | | | | | | uses of this function (or the "files" stanza in configure.json) which don't explicitly target windows don't specify the .exe extension, so we need to add it automatically if it's missing. Task-number: QTBUG-57436 Change-Id: I1994378399bc3466c32ee065e752516f42652975 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * escape literal backslashes in qmake filesOswald Buddenhagen2018-12-126-25/+25
| | | | | | | | | | | | Task-number: QTBUG-70765 Change-Id: I56abbf19be88d01b2964980fb741567f28e4f0fa Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Silence GCC 9 warningsVille Voutilainen2018-12-112-1/+24
| | | | | | | | | | Change-Id: I5654881a3adac6f67a38837321c8e1c3ce1e2d8f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-111-6/+3
|\| | | | | | | Change-Id: I91e684e74c36467efda8ded6ed19791baa0c1a1f
| * Fix build of static plugins with resourcesRichard Moe Gustavsen2018-12-101-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reverts 388c4ef9f78c8e. The reason is that it generates a symbol (resource_init_function) based on the name of the pro-file. But if different plugins are built from a pro-file with the same name, you end up linking in many symbols with the same name as well. Which one that ends up being used at runtime will typically depend on the linking order of the plugins. This problem will happen if you build an app for iOS that uses both controls 1 and controls 2. In that case, both QML plugins are built from a "controls.pro" file. At runtime, only one of the plugins will be imported correctly. This patch therefore reverts 388c4ef9f78c8e, but at the same time, to not re-introduce the problem it fixed, we instead genereate both a debug and release version of the plugin_resources.cpp file. That way we can still depend on the TARGET variable for generating both the resource_init_function symbol and the cpp file. Fixes: QTBUG-62647 Fixes: QTBUG-71386 Fixes: QTBUG-72108 Change-Id: I3d8c53132458b30ed9f47a259f1f8e4fa4d44130 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-095-18/+92
|\| | | | | | | Change-Id: I10ae61ec6867b38601d85d6fc34e1f6a6ba0cc11
| * add support for transitive deps to QMAKE_USEOswald Buddenhagen2018-12-074-18/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already knew the dependencies (as they are declared in the json files), but failed to export them in any way, which made linking against statically built external deps which have deps in turn fail (unless the project happened to pull in the dep anyway, as is the case with qtcore + zlib). the previous assumption was that the USE-able library objects would be self-contained, but that is conceptually unclean. instead, properly export the raw dependencies and resolve them only in qmake_use.prf. note that pkg-config produces self-contained output, so we need to actively subtract the dependencies we know. Change-Id: I4b41a7efc05bbd309a6d66275d7557a80efd5af4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qmake: fix QMAKE_DEFAULT_LIBDIRS detection for android on windowsOswald Buddenhagen2018-12-071-0/+2
| | | | | | | | | | | | | | | | | | | | clearly, nobody told clang that on windows you're supposed to use semicolons instead of colons to separate elements of a path list ... Fixes: QTBUG-72268 Change-Id: Ia7adc8de3bca586d4c15b069cb04e4cb647ae823 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-083-1/+11
|\| | | | | | | Change-Id: Ied1194730e75a6f30839bbf5429aa2699230288e
| * Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into ↵Liang Qi2018-12-072-1/+4
| |\ | | | | | | | | | refs/staging/5.12
| | * Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-052-1/+4
| | |\ | | | | | | | | | | | | Change-Id: I54b4c14bed5150d3034ac87907a09254fd78face
| | | * macOS: Don't link to debug versions of frameworks unless requestedTor Arne Vestbø2018-11-272-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failure mode of this behavior is worse than the surprises that the non-explicit library dependency chain has, so it should be opt-in. This reverts back to the behavior in Qt 5.11, but lets our tests opt in to the feature. Fixes: QTBUG-71724 Change-Id: Iede11f02d978b637324ddf71d29e7c99fe3ee99f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * | | configure: query pkg-config for deps of static libsOswald Buddenhagen2018-12-071-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that pkg-config is a tad stupid: it won't tell us if the package is built statically, but one needs to explicitly ask it to output transitive deps for static packages. we can do that, as we resolve the pkg-config output to actual libraries, so we know if they are static. always asking it would print the transitive deps also if we found a dynamically linked library, which would inappropriately extend the link interface. the latter actually happens on windows (because we can't easily tell apart real static libs from import libs), but that doesn't matter, as under windows, the linker transitively resolves dlls anyway. Change-Id: If1be3b3df476374d5c8e62f4b185477c988223b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Add support for linking against static builds in CMakeKyle Edwards2018-12-071-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change reinstates functionality that was removed in commit 102e1822ffcdc9954d3c698f863734a8083e349c. However, it differs from the original implementation in several ways: * It uses the QMAKE_PRL_LIBS variable, replacing whitespace with semicolons, rather than using a dedicated QMAKE_PRL_LIBS_FOR_CMAKE variable. * More importantly, it parses the -L and -l flags and uses CMake's find_library() command to look for the libraries in the specified search paths, and then converts them to absolute paths. This is the same approach that CMake's own FindPkgConfig module uses to find libraries specified in this form. Any other flags not of the form -L or -l (for instance, -s flags passed to Emscripten) are added to the new INTERFACE_LINK_OPTIONS target property if the CMake version is 3.13 or newer. The original implementation of this functionality was removed because of the lack of absolute library paths. At the time, it was believed that qmake would have to be modified to do its own equivalent of find_library() to get the absolute paths to the libraries. However, the approach taken by FindPkgConfig has proven robust enough to be used here, allowing CMake to find the absolute paths to the libraries without having to modify qmake. [ChangeLog][CMake] Added support for automatic linking of transitive dependencies in static builds Fixes: QTBUG-38913 Change-Id: I7d9cdb0d339c6ef697b04099d129481c770fc0fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Enable Werror for clang 7.0 tooSergio Martins2018-12-051-2/+2
| | | | | | | | | | | | | | | Change-Id: Idc8d39d198500632cfb7a3ec6b471ba6ec1ce4ee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-12-049-50/+159
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper.cpp Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e
| * | macOS: Fix Objective-C namespaceing with Xcode 10Tor Arne Vestbø2018-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 10 ships version 921.0.1 of cctools, which otool is part of. The defaults have changed in that version to no longer print verbosely (symbolically), which we relied on. We now request it explicitly. Change-Id: Ifbe0c97462b9f78cf128c820847eff9c72f17065 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Tim Blechmann <tim@klingt.org>
| * | configure: actually resolve libraries into full filepathsOswald Buddenhagen2018-12-033-40/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this considerably speeds up failures, as no doomed build is attempted, and produces more reliable results, as no second lookup (which would be subject to environment changes) is done any more during the build. in principle, this also opens up possibilities like selecting specific variants of dependencies, automatically extracting rpaths, etc. qt_helper_lib.prf also needs to create fully resolved library names now. Change-Id: I65f13564b635433030e40fa017427bbc72d1c130 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | qmake: fix QMAKE_DEFAULT_LIBDIRS detection on androidOswald Buddenhagen2018-12-032-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | amazingly enough, android has different sysroots for the compiler (shared includes full of #ifdefs) and the linker (per-platform libraries). this patch supports only clang for non-darwin, which notably covers all supported android ndks. with this fixed, we also remove the hard-coded setting of QMAKE_DEFAULT_*DIRS from the specs. amends 353fb118c. Change-Id: Ie0513de0f7123d7f5b8ca1ffcc72c017cddd126c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | WebAssembly: Fix compilation of application on Windows hostEskil Abrahamsen Blomfeldt2018-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running configure on a Windows host, it would fail with the error that the copy statement was invalid, due to the forward slashes. This makes configure finish without errors. Task-number: QTBUG-72000 Change-Id: Id315d7436bbbfd2cd5c5f2dfcfe0c3dc3b9e34c2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * | ctest: Make cmake test pass if it has been run beforeOliver Wolff2018-11-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | We have to check if the directory exists before calling mkdir or the test will fail on every run but the first one. Change-Id: I36f10cfc18b3cb99990dc96190349ee00a0c1c4e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Active Qt Servers: Fix midl warning about unknown optionFriedemann Kleint2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the option from msvc-desktop.conf, which duplicates the /nologo option in idcidl.prf. Fixes: QTBUG-72046 Change-Id: I906097e0611f4578c307616b3f9ebecdfc4d8812 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 07:50:52 +0000