summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix QMAKE_PRL_INSTALL_REPLACE for macOSJoerg Bornemann2019-05-221-2/+6
| | | | | | | | | | | | | The regular expression with the alternative is not portable. Use a separate QMAKE_PRL_INSTALL_REPLACE item. This amends commit f00de33. Fixes: QTBUG-75950 Change-Id: I78e172053f8b05be7d595a1c9e1695ea658b0547 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Replace absolute Qt lib dir in .prl filesJoerg Bornemann2019-05-201-0/+2
| | | | | | | | | | | | | | | In the case of building a Qt module repository against an installed qtbase the .prl files contain absolute paths to Qt dependencies e.g. '/install-prefix/lib/libQt5Core.so'. Those must be replaced with $$[QT_INSTALL_PREFIX]. The .prl replacement code however only takes $$MODULE_BASE_OUTDIR/lib into account. Fixes: QTBUG-75804 Change-Id: I5ea5623ca7396b672fded3f1b9434b9ad5ed12ec Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix emar invocation on Windows for MinGWKai Koehne2019-05-131-1/+1
| | | | | | | | | | | | | | If qmake is called without sh.exe in PATH, the relative paths in OBJECTS will contain backslashes as separator. Anyhow, emar needs forward slashes. Use GNU make's subst command to fix this. This amends 22c1e10e1955c63. Task-number: QTBUG-75257 Change-Id: Iacc6fe69cf470f35c6ddd829be7a80944346452d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: Fix x86_64 linkingBogDan Vatra2019-05-081-0/+1
| | | | | | | | | | | x86_64 libs are located in ANDROID_PLATFORM_ROOT_PATH/usr/lib64 not in ANDROID_PLATFORM_ROOT_PATH/usr/lib . Fixes: QTBUG-47672 Change-Id: Ia1f74f7c2a30b276b95fd0e7dcf8370d739e3c41 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 43763e279644cdd2a52d770b9aeda4d485caaa76) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge 5.13 into 5.13.0Frederik Gladhorn2019-05-078-33/+29
|\ | | | | | | Change-Id: I98e2b93d78dba1cbf746c39a0b5877d5e72c91fc
| * Android: Nuke mips architecturesBogDan Vatra2019-05-063-12/+0
| | | | | | | | | | | | | | Mips archs were removed from Android NDK long time ago. Change-Id: Icf64a1e2cfbe3fe7307c7898b14fd199d9eeaad3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-064-8/+19
| |\ | | | | | | | | | Change-Id: Iaad9509712c848ed42ada2c25065162a6fc5a930
| | * Resolve QMAKE_INCDIR_VULKAN on every qmake callJoerg Bornemann2019-05-054-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not store this variable locally, because a) it might change if the SDK location changes b) does not play well with Qt installer packages which would provide the include path of the build machine. To achieve this we introduce the (usual) magic value - for QMAKE_EXPORT_INCDIR_VULKAN to denote "do not export this value". Fixes: QTBUG-73796 Change-Id: Ied26ee12cbcdf7f5f6e1caef5d29dadf6309c5d6 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-05-031-0/+4
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/pcre2/qt_attribution.json Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15
| | * Fix prl replacements if libdir is in QMAKE_DEFAULT_LIBDIRSJoerg Bornemann2019-05-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMAKE_PRL_LIBS contains absolute paths to libraries, e.g. libqtpcre2.a. On "make install" the libdir is replaced with the installation target libdir. If the libdir is in QMAKE_DEFAULT_LIBDIRS (e.g. /usr) then the replacement was empty. That worked fine for include paths but not for paths referencing files in that libdir: /my/build/lib/qtbase/lib/libqtpcre2.a would become /libqtpcre2.a. Add another replacement that takes care of file paths and inserts $$[QT_INSTALL_LIBS]. Fixes: QTBUG-75460 Change-Id: I4e84478a50c24d4143ad5695493cad2992735cf2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Fix -Wdeprecated-copy warningsAllan Sandfeld Jensen2019-05-011-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit copy constructors or methods are considered deprecated for classes that has one of the two or a destructor. The warning is enabled with -Wextra in gcc 9 Change-Id: Ic9be654f2a142fb186a4d5a7d6b4f7d6f4e611d8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Fix emar invocation on WindowsJoerg Bornemann2019-05-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows we hit the command line length limit when building the wasm port of Qt. We must not pass the list of object files directly to emar, but write a response file which is then passed via the @ parameter. Fixes: QTBUG-75257 Change-Id: Id518fd81325716b8efaba29f495568a9a3e34be4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | CMake: Ignore CMAKE_CXX_STANDARD_LIBRARIES in .prl filesKai Koehne2019-04-301-1/+10
|/ / | | | | | | | | | | | | | | | | | | Do not call find_library() on libs that are part of CMAKE_CXX_STANDARD_LIBRARIES: At CMake call time they might not be found. Fixes: QTBUG-73475 Change-Id: I350b3280744883e82d83c46e70f6a7cfc8aeed2e Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-283-2/+15
|\| | | | | | | Change-Id: Ibce9bfef928ce39070183c488ce86ae32e5ea705
| * Fix determination of OpenGL include paths on macOS, take 3Joerg Bornemann2019-04-273-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sysrootification of QMAKE_INCDIR_OPENGL on macOS must happen only once. Commit 49ef3773 addressed this but stored the sysrootified QMAKE_INCDIR_OPENGL in qt_lib_gui_private.pri. For installer packages, these paths are the paths of the build machine and most likely wrong on the user's machine. This reverts commit 4949ef377349ba4dae840c2d5caa36e2d516707baa and restores the sysrootification in sdk.prf. The original include paths are assigned to QMAKE_EXPORT_INCDIR_OPENGL and stored as QMAKE_INCDIR_OPENGL in qt_lib_gui_private.pri. Fixes: QTBUG-75374 Task-number: QTBUG-73736 Change-Id: I4c0f65866d60660c632363dba3adc7ea2e344bfc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-261-3/+7
|\| | | | | | | Change-Id: I6ecf7074eda57ef4954fb3fdc7a6d1e8cd229340
| * qmake: Always split QMAKE_DEFAULT_LIBDIRS using ; with clang on windowsMartin Storsjö2019-04-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building in a unix style build system (i.e. msys), QMAKE_DIRLIST_SEP is a colon, not a semicolon. Thus, always split the incoming string (after the fixup regex) using semicolons on windows. This matches the code for gcc, further up, which does: equals(QMAKE_HOST.os, Windows): \ paths = $$split(line, ;) else: \ paths = $$split(line, $$QMAKE_DIRLIST_SEP) Change-Id: I6a0175f9d14ae9ca188553483b7868f0549c784a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-242-1/+15
|\| | | | | | | Change-Id: I26da00aa71b0f0b91c9bfb4a9e8550345ee62875
| * configure: Support the = prefix for -I and -LJoerg Bornemann2019-04-231-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | For gcc's -I and -L arguments a = prefix is replaced by the sysroot. Since we're resolving include paths and library paths, we have to support this feature. For example, the linux-rasp-pi3-g++ makes use of this and is broken without this patch. Change-Id: Ie39e63322bd35e2a93aa8e55d52260164b8c6a6b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * syncqt: Fix resolution of injected headers for external modulesJoerg Bornemann2019-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Injected headers were made relative to MODULE_BASE_OUTDIR by syncqt and made absolute by resolving against REAL_MODULE_BASE_OUTDIR. This breaks for modules that reside outside the original Qt source tree (if the directory depth doesn't coincidentally match). Now, we resolve injected headers against build_basedir, which is REAL_MODULE_BASE_OUTDIR. To emphasize the equivalence of REAL_MODULE_BASE_OUTDIR and syncqt's build_basedir, use the former for syncqt's -output argument. This commit amends 2aa779e8. Fixes: QTBUG-70587 Change-Id: I2935d87d7ee681fa4aa795a270b94ab7a43abe59 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Add qmake support for c++2aAllan Sandfeld Jensen2019-04-195-3/+11
| | | | | | | | | | | | | | | | Makes it possible to build user projects and Qt with C++2a. It is not automatically upgraded to yet though. Change-Id: I949ce94871ddc53f21b7265a52b9c0e1370456c8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-04-166-42/+48
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale.qdoc tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io> Change-Id: I88e0757b2d020f0a244714c87844631df4b3fd13
| * qmake: link qt libraries by full pathOswald Buddenhagen2019-04-154-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this avoids the scenario where the linker would pick up the wrong qt libraries for LIBS_PRIVATE because LIBS added the "wrong" path first. this is also consistent with configure-supplied dependencies as of recently. as a side effect, this also removes pretenses of lsb linker handling, as it makes no sense after the change and is certainly obsolete anyway. Fixes: QTBUG-50921 Change-Id: I84398c9143f393c2eefb3c69a31bd9f633669924 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * CMake: fix generation of config files for external Qt modules on macOSJean-Michaël Celerier2019-04-122-15/+20
| | | | | | | | | | | | | | | | | | | | This is a follow-up to f5850cb0da5d9b610711d4fd3c1eaded9d6414e1, which did not take into account some special-casing for macOS framework build, thus causing CMake to look for QtFoo.framework instead of Foo.framework. Change-Id: I261b14e75fde66fb57486bde43fc936f796a6f96 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* | Fix precompiled headers with clang-clv5.13.0-beta2Allan Sandfeld Jensen2019-04-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang-cl couldn't find the header given to it by -FI when it isn't in any of the included directories. Additionally clang-cl 8 has a bug with exported templated classes with inline methods that causes it to have missing symbols at link time. We work around this. Fixes: QTBUG-74563 Change-Id: I7becf05fa8edb07bd4cefe12bee3737e5e1dfa14 Reviewed-by: Yuhang Zhao <2546789017@qq.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-021-0/+4
|\| | | | | | | Change-Id: Ia5d893e57deb78bc32e2053a5a79543ff847fe32
| * Fix cross compile on UbuntuYuhang Zhao2019-03-301-0/+4
| | | | | | | | | | | | | | | | | | When cross compiling on Ubuntu with LTO enabled, the linker will complain about the "-fno-fat-objects" parameter even if the "-fuse-linker-plugin" is passed it. But if the "-fno-fat-objects" parameter is removed, the linker will complain about "don't support linker plugin in this mode". Remove both parameters can fix this. Change-Id: I2d792ca70737f2e82a360bfc597f2b110513b954 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-301-2/+2
|\| | | | | | | Change-Id: I9935bacae0d6ba532418fc3d28adbc7ca1463604
| * Speculative fix for building on INTEGRITY with ARM NEONAllan Sandfeld Jensen2019-03-291-2/+2
| | | | | | | | | | | | | | | | Avoid using inline assembler Task-number: QTBUG-72716 Change-Id: I696efb5a787416eb4fc5ba3a250461aaa9a4afc2 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* | Handle quotes in .prl filesKai Koehne2019-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do remove quotes around libraries before trying to parse them. This patch is a follow-up to eda28621f6c1a68774719f, and fixes an issue on Windows where e.g. Qt5AxServer.prl contains entries like "-lole32" Fixes: QTBUG-73475 Change-Id: I3d1353de618328a0d44bacd4dbd6aba8fc66b1b7 Reviewed-by: Kyle Edwards <kyle.edwards@kitware.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-213-15/+37
|\| | | | | | | Change-Id: Ie7f68dcd5650e0037b6c3313cc9ffdcd7c494fbe
| * Add a means to handle dynamically created qmldir filesAndy Shaw2019-03-201-3/+17
| | | | | | | | | | | | | | | | | | | | | | This will enable modules like QtWebView which needs to generate its qmldir at qmake time since it changes depending on whether QtWebEngine is available or not. This ensures that it is not created in the sources directory and in the build directory and correctly picked up. Task-number: QTBUG-65092 Change-Id: Iac628b97145d29778f554510e8e07102d588df64 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * configure: Allow libraries to be defined with exact filenameTimo Aarnipuro2019-03-201-1/+9
| | | | | | | | | | | | | | | | | | INTEGRITY compiler searches for exact filename if the -l argument already contains .a suffix. GNU linker uses exact filename if -l argument begins with a colon. Change-Id: I62be8f1e6b9c7dc7eaa5ab3d4bfc55460d729737 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * win32-clang-msvc: qmake.conf: Fix alignmentYuhang Zhao2019-03-201-11/+11
| | | | | | | | | | Change-Id: I62bff5e10c0dfb45078a9ff5a2378f251c6596aa Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-201-2/+6
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qplatformintegration.cpp src/gui/kernel/qplatformintegration.h src/plugins/platforms/wasm/qwasmintegration.cpp src/plugins/platforms/xcb/qxcbconnection_screens.cpp Change-Id: I15063d42e9a1e226d9d2d2d372f75141b84c5c1b
| * Replace instances of - with _ when generating the function nameAndy Shaw2019-03-191-2/+4
| | | | | | | | | | | | | | | | | | As - cannot be used in a function name but can still be used as part of the TARGET, then we need to make sure that it is replaced to avoid a compile problem. Change-Id: I0b2e465310206e2522ce59235b1592517817d3e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+2
| |\ | | | | | | | | | Change-Id: I5f9d8090a07056411fb65d7de60eb679d00e99a3
| | * Automatic resources: Fix tooling supportChristian Kandeler2019-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files to be put into an auto-generated qrc file must not simply disappear, because IDE users still need to have them in the project tree. So we add them to OTHER_FILES now. Task-number: QTCREATORBUG-20103 Task-number: QTCREATORBUG-20104 Change-Id: I8a9136491f975def7c33385e375c407815ad269a Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Wasm: Build with Qt's freetype, png and zlibEskil Abrahamsen Blomfeldt2019-03-191-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilation breaks on Windows and macOS hosts with USE_ZLIB=1. In addition, it turns out that the versions of the libraries in Emscripten Ports are outdated. Since we have newer versions of these libraries in Qt already, we will just use those. This is a revert of 70b558ad5b7972178b990b33cbd73694775b265f. Task-number: QTQAINFRA-2835 Change-Id: Ic2642b7d319a3447fd08843657eb0535255e0449 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | wasm: Add WASM_OBJECT_FILES=1 build modeMorten Johan Sørvig2019-03-061-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mode significantly improves build (link) time. Opt-in by passing “-device-option WASM_OBJECT_FILES=1” to configure. This requires a custom emsdk build which uses upstream llvm. Task-number: QTBUG-72537 Change-Id: I47bab2b58ae7e49ca104233ec14fff7b93516d36 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-022-2/+4
|\| | | | | | | | | | | Change-Id: I83f6ed9480bf21020ce7a9431010d87a88df84a1
| * | CMake: fix generation of config files for external Qt modulesJean-Michaël Celerier2019-03-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When such modules aren't following the libQt5Foo.so naming convention, the generated CMake files would be incorrect. Change-Id: I57908f7466bff7a05f19271ccd495849476bdf38 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
| * | Actively discard return value of qtConfGetNextCommandlineArgJoerg Bornemann2019-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling a qmake replace function without assignment is undefined behavior. This amends 11ae0e77. Change-Id: Ie716f295275d1ba79a217745b332a8eca04b355d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-282-5/+1
|\| | | | | | | | | | | Change-Id: Icc9b061c56e969756f0351c936cdeb8063c86079
| * | Fix determination of OpenGL include paths on macOS, take 2Joerg Bornemann2019-02-272-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sysrootification of OpenGL include paths must be done only once: at configure time. The resolved paths are stored since 521a8539 and must not be resolved again. Turn the makeSpec-type opengl library into a custom-type one, and do the sysrootification in the handler function. Fixes: QTBUG-73736 Change-Id: I2933144057d6f01d8bfc7bda2c2df56c57303459 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Allow QML plugin to specify import name explicitlyKai Koehne2019-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For creating the qmlplugindump rule we need the name of the import. So far we're trying to derive this from the directory name, but that becomes complicated if versions are included, like QtQuick/Controls.2/Fusion Instead of trying to tweak the regexp even more to capture this, we now allow a plugin to set it's name explicitly via IMPORT_NAME. Change-Id: Ie75dae7d41398b3ac19ccb6910002b6fad009891 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-221-1/+3
|\| | | | | | | | | | | Change-Id: I9e7cb1b131b7b216aad8ed1b1536669fd1557c21
| * | qmake: Fix COPIES for Visual Studio projectsOliver Wolff2019-02-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | QINSTALLS is not set when Visual Studio projects are used. Use its resolved value in case that Visual Studio projects are generated. Change-Id: I8c21d4335971f45e56b3549086cb803c2d464158 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into ↵Qt Forward Merge Bot2019-02-218-0/+235
|\ \ \ | | | | | | | | | | | | refs/staging/5.13
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-218-0/+235
| |\| | | | | | | | | | | | | | Change-Id: I830beea26863323ab78a5d4b093f7763d77ad3da