summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-04-101-3/+0
|\ | | | | | | | | | | | | | | Conflicts: mkspecs/win32-clang-msvc/qmake.conf src/gui/image/qpnghandler.cpp Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8
| * 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 "Merge remote-tracking branch 'origin/5.13' into dev" into ↵Qt Forward Merge Bot2019-04-048-31/+57
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-031-0/+4
| |\| | | | | | | | | | Change-Id: I99a27f9a0402e1ccad45a2d062d784f8d9a08dd3
| | * 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.13' into devLiang Qi2019-03-311-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919
| | * | 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>
| * | | configure: Warn about redundant and contradictory optionsJoerg Bornemann2019-03-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure will print notes in the following situations: - redundant options, e.g. -gui -gui - contradictory options, e.g. -gui -no-gui Fixes: QTBUG-53499 Change-Id: I6cf023e7730907069cf971f5982a41453f611c3c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | | Merge remote-tracking branch 'origin/5.13' into devFriedemann Kleint2019-03-266-29/+44
| |\| | | | | | | | | | | | | | Change-Id: I38389a69411f4549fed432f1181dbe23398b34a2
| | * | 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>
* | | | | Clang_cl: Use -O3 for full optimizationAllan Sandfeld Jensen2019-04-041-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass it through as a traditional clang argument instead of relying on what MSVC cl.exe can take. Change-Id: I94405ce6ab80d16b687e62c9aa4b2866ba84f0e2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Clang: use -Oz instead of -O1 to optimize for sizeYuhang Zhao2019-03-214-2/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I60fecba64e968d10b87a9c1af571ff4a3aa98ad7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | clang-cl: Enable linker optimization explicitlyYuhang Zhao2019-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In release mode, MSVC linker will enable it by default while clang-cl won't. So enable it explicitly. Change-Id: Iabfd8698d426290fee59662acf6c124b9f226c11 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Clang: Add Thin LTO in addition to Full LTOYuhang Zhao2019-03-204-3/+13
|/ / / | | | | | | | | | | | | Change-Id: I6502f3ff31c16faebd9b931b99b77a273971f611 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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
| | * | winrt: Add support for Visual Studio 2019Oliver Wolff2019-02-208-0/+235
| | |/ | | | | | | | | | | | | Change-Id: I5a07a3d20425a8c7ce2b2477792c379afeff5680 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
* | / wasm: fix system lib detection and useLorn Potter2019-02-201-0/+8
|/ / | | | | | | | | | | | | | | | | | | This is a revert of eea08d376ac5cb35ff03be630923f21f7fa3aecd. We need these flags to be added to the compiler in order to find the emscripten ports to be able to use them. Task-number: QTBUG-73127 Change-Id: Icf70f456947aef04dc79b2328f2e95fb1e94fcf8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-194-3/+8
|\| | | | | | | Change-Id: Ifa143cc462301aaa305c9c85360e543553a751f0
| * Add cmdline feature to qmakeJoerg Bornemann2019-02-182-2/+3
| | | | | | | | | | | | | | | | | | [ChangeLog][qmake] A new feature "cmdline" was added that implies "CONFIG += console" and "CONFIG -= app_bundle". Task-number: QTBUG-27079 Change-Id: I6e52b07c9341c904bb1424fc717057432f9360e1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| * Revert "Fix determination of OpenGL include paths on macOS"Joerg Bornemann2019-02-162-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 37970d7b3e6fff92dca98db974ada865c1bfd730. That commit broke the build on macOS, because the OpenGL headers aren't resolved anymore at configure time. Change-Id: Iec6ef009c9ea7e28b12eeca6b5eb06918bf49d98 Fixes: QTBUG-73827 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-157-5/+20
|\| | | | | | | Change-Id: I8cad26f17834dbc9f7151edc0f17786f9e32025d
| * Add <features.h> include to hurd-g++ mkspecSamuel Thibault2019-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | Without this include, __REDIRECT does not get defined, and then open gets #defined to open64, leading to bogus MOC output. See https://bugs.debian.org/920613. Change-Id: I629d9dc6af05b9480c0c81a61d8890ab8bbefaae Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Turn bcm_host library into makeSpec sourceJoerg Bornemann2019-02-143-0/+13
| | | | | | | | | | | | | | | | | | The bcm_host library couldn't be detected anymore. Let the makespec provide LIBDIR, INCDIR and LIBS for bcm_host to fix this. Change-Id: I4bc268504dc48edaf2884f1c14b745260fd9112c Fixes: QTBUG-73727 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Add support for Visual Studio 2019Oliver Wolff2019-02-131-0/+5
| | | | | | | | | | | | Change-Id: I963fc1c159edc644f081675c3dee248c25d7c9dc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
| * Fix determination of OpenGL include paths on macOSJoerg Bornemann2019-02-122-5/+1
| | | | | | | | | | | | | | | | | | Since include paths are fully resolved, we must remove the code that prepends the SDK path to the OpenGL include paths. Change-Id: I80d74629c7fc989a89c3f1d95d6de43b4c1de17a Fixes: QTBUG-73736 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into ↵Liang Qi2019-02-121-1/+4
|\ \ | | | | | | | | | refs/staging/5.13
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-121-1/+4
| |\| | | | | | | | | | Change-Id: Iad53d4f21263718b8ecf15fd2d1170d24c7b675d
| | * configure: use proper separator for mingw librariesEric Lemanissier2019-02-121-1/+4
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ic328691fe2f08e918c1bb67910521d85b274a8fd Fixes: QTBUG-73466 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Fix detection of libraries when linking against static builds with CMakeJean-Michaël Celerier2019-02-121-0/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is a follow-up to eda28621f6c1a68774719f382be53ec109123b18. It adds a translation of the $$[QT_INSTALL_LIBS] variable into a path that CMake understands. Without this, CMake finds the system libraries if there are any instead. It also handles the case where the .prl file contains absolute paths to libraries, as it happens for instance on Debian systems. Task-number: QTBUG-38913 Change-Id: If68373efee22bc00172e8fead3e2c12ea440787f Reviewed-by: Kyle Edwards <kyle.edwards@kitware.com> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:43:40 +0000