summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Fix prefix_build check for top-level buildsJoerg Bornemann2019-06-053-5/+30
| | | | | | | | | | | | | | | | | | | | | The checks whether we have a Qt prefix build were broken for top-level builds. Non-prefix top-level builds were incorrectly detected as prefix builds. For top-level non-prefix builds QT_HOST_DATA/QT_INSTALL_PREFIX becomes something like "~/my/build/dir/qtbase" but .qmake.cache (and .qmake.super) is/are created in "~/my/build/dir". This patch extends the prefix_build check by probing for the existence of .qmake.super, which only exists for top-level builds. Also, we add qt_prefix_build_check.prf as central place for determining whether we have a prefix build to make sure that qt_configure.prf and qt_build_config.prf use the same logic. Fixes: QTBUG-76185 Change-Id: I2b76fe26013496aaf2dac96ea711b06a69550a29 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Make sure .pc, .prl and .la files are created for header_only modulesJoerg Bornemann2019-06-031-0/+5
| | | | | | | | | | | | | | | Those modules are TEMPLATE=aux, so they weren't triggering the file creation here. To make this work properly we have to: - check for TEMPLATE aux in the right places - add a dummy target to INSTALLS to actually trigger the creation - initialize PRL_TARGET for aux templates Fixes: QTBUG-75901 Started-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: Idce141629dd34287808bfffd159f92ac28c6c8b1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Copy plugins.qmltypes files to build dir (again)Kai Koehne2019-05-151-7/+4
| | | | | | | | | | Since change c808a6978b0e9908 plugins.qmltypes and designer/* didn't get copied anymore for a non-prefixed build. Fix this, and clean up surrounding code. Fixes: QTBUG-75682 Change-Id: Ic6de94a5b01dae08929a67cbaedde60d120a4807 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix CMake file generation for debug libs on macOSJoerg Bornemann2019-05-091-3/+3
| | | | | | | | | | | CMAKE_QT_STEM already contains the _debug suffix. Do not add it again. This amends commit bb8a3dfc. Fixes: QTBUG-75520 Change-Id: I6c311f0913ea83fcf299a21a0ee1f28c3861371f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Resolve QMAKE_INCDIR_VULKAN on every qmake callJoerg Bornemann2019-05-053-4/+18
| | | | | | | | | | | | | | | 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>
* 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 determination of OpenGL include paths on macOS, take 3Joerg Bornemann2019-04-272-1/+14
| | | | | | | | | | | | | | | | | | 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>
* 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>
* 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>
* qmake: link qt libraries by full pathOswald Buddenhagen2019-04-153-26/+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>
* 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>
* 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>
* | 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>
* | Fix determination of OpenGL include paths on macOS, take 2Joerg Bornemann2019-02-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* 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-161-0/+4
| | | | | | | | | | | | 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>
* Fix determination of OpenGL include paths on macOSJoerg Bornemann2019-02-121-4/+0
| | | | | | | | | 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>
* 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 install targets for generated private headersJoerg Bornemann2019-02-061-0/+2
| | | | | | | | | | | Header files of modules that specify generated_privates are usually not yet available at qmake-time. Thus, the installation rule must not check for the file's existence. Change-Id: Ifc7ff95422912d255744c9006382ff181176ae77 Fixes: QTBUG-71340 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* qmake: Add variables for setting the version number and name in AndroidAndy Shaw2019-02-041-0/+8
| | | | | | | | | | | | | | | This makes it much easier to have the version information set for an Android APK without having to manually modify the AndroidManifest.xml each time. [ChangeLog][Android][qmake] Can now set the version name and code for Android using ANDROID_VERSION_NAME and ANDROID_VERSION_CODE respectively in the pro file. Change-Id: Ie6813bc3a7444f7baa5e772b93bc2695d9b81e57 Done-with: Markus Maier <markus.maier@rosenberger.de> Reviewed-by: Markus Maier <markus.maier@rosenberger.de> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* macOS: Don't check for stale SDK unless target needs to be remadeTor Arne Vestbø2019-01-291-10/+23
| | | | | | | | | | Also catches some more variants of SDK mismatch, such as Xcode not being installed at all, or the SDK missing. Change-Id: I184aaa571ef0ea722ca64c54f665462dabc17533 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* configure: Respect -continue in qtConfParseCommandLineJoerg Bornemann2019-01-291-1/+4
| | | | | | | | | | | | | If configure is called with -continue, it should not stop processing command line arguments after encountering an invalid one. Example: configure ... -continue -quack -no-feature-gui would ignore everything after -quack. Change-Id: Ia5f0cb13414c9c0c7246ff0c72f8e935fe6dca3c Fixes: QTBUG-72912 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Consume the -skip option in qtbase/configureJoerg Bornemann2019-01-291-0/+9
| | | | | | | | | | | | | ...and yield a warning that -skip has no effect in a qtbase build. This is consistent with configure's help output and enables us to always pass "-skip qtwhatnot", whether we're calling top-level or qtbase configure. Change-Id: Ie5b0791a6000d1d78b1367658ad86a92b2ec6a6a Fixes: QTBUG-71253 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Wasm: disable resources_bigMorten Johan Sørvig2019-01-281-1/+1
| | | | | | | | Errors out with “No data signature found”. Change-Id: Ia9a38e8c71aef4e090494ed4754f4c14e913b092 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-01-233-3/+5
|\ | | | | | | Change-Id: Icebd151eae0cf9d400319a42573290d1a911ce26
| * Remove duplicate windeployqt_clean targetJoerg Bornemann2019-01-161-1/+0
| | | | | | | | | | | | | | | | That target is added unconditionally at the end of windeployqt.prf. Fixes: QTBUG-73018 Change-Id: I8d29691c30df64bf5383daa10e169985d47592f2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Fix resolving of libraries on Apple platformsJoerg Bornemann2019-01-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt couldn't be configured with -system-zlib on macOS, because qmake failed to find "/usr/lib/libz.dylib". The library path is something along the lines of "/Applications/Xcode.app/.../MacOSX10.14.sdk/usr/lib" which doesn't contain "libz.dylib". But it contains "libz.tbd", which is a YAML-file pointing to "/usr/lib/libz.dylib". One can pass the absolute path to this tbd file to the linker, which will then pick up "/usr/lib/libz.dylib". Introduce a new variable QMAKE_EXTENSIONS_AUX_SHLIB, which is a list of auxiliary extensions for shared libs, and add the "tbd" extension to it on macOS. Change-Id: I083b79a69d00232e35f9d6164ffa86cb473f1742 Fixes: QTBUG-72745 Fixes: QTBUG-72964 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.12.1Liang Qi2019-01-0815-201/+472
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/kernel/qtooltip.cpp Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8
| * | Bump copyright year to 2019Kai Koehne2018-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-72635 Change-Id: Idc9bd97fe873b332d7ff72cb44a00334a472404f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Fix default rpath dirs on Apple platformsTor Arne Vestbø2019-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The @executable_path relative framework directory is one step below the executable, as in: Foo.app/Contents/Frameworks not: Foo.app/Contents/MacOS/Frameworks The former is what Xcode defaults to for new projects. Change-Id: Id08f3f1d80f1c84d76fb71676c5df4a3a6b3da36 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | macOS: Use tool environment to ensure tests load matching Qt librariesTor Arne Vestbø2019-01-122-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linking with a framework suffix to pick up the debug version of libraries doesn't work as long as the dependencies picked up from prl files are not rewritten to also include the suffix. The result is that we end up loading both release and debug versions of the Qt libraries. Use the target environment (target_wrapper.sh) to set the image suffix instead, which means 'make check' will automatically work. Change-Id: I60b0840760f68e579c270245d394e1dd609a0ebb Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | qmltestcase: Fix generation of Visual Studio project filesOliver Wolff2019-01-111-1/+2
| |/ |/| | | | | | | | | | | | | | | Mimicking the approach from testlib_defines.prf, DEFINES containing a path surrounded by quotation marks have to be handled differently for Visual Studio projects. Change-Id: I26f6a45d4df154f599e8be15b3aa3905cf703a1f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | qmake: make CONFIG+=egl work againOswald Buddenhagen2019-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | while it's legacy and should not be used (use QMAKE_USE+=egl instead), it shouldn't be broken nonetheless. amends 310bf3f57c. Fixes: QTBUG-72564 Change-Id: Id6a070a4653dc1182a6b4d75af027a6ee6cbacae Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* | qmake: rewrite msvc/nmake cross-build environment setupOswald Buddenhagen2019-01-052-9/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than reproducing vcvarsall.bat's functionality as hard-wired code in the nmake generator, just invoke the actual script from toolchain.prf. this is much easier, more future proof, and - critically - makes the detected variables available to configure's new library & header search facilities. [ChangeLog][Important Behavior Changes][qmake][WinRT] Cross-builds will now ignore pre-set values of %INCLUDE% and %LIB% when building target executables. If necessary, use configure's -I and -L switches when building Qt, and pass QMAKE_INCDIR and QMAKE_LIBDIR on qmake's command line when building own projects. Change-Id: I36f53e8880d6523f3f6f7a44d40d87d04bd06854 Reviewed-by: Thomas Miller <thomaslmiller91@gmail.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | qmake: reshuffle toolchain.prfOswald Buddenhagen2019-01-051-103/+106
| | | | | | | | | | | | | | | | | | swap the order of compiler version detection and default path detection. this keeps a subsequent commit smaller, which introduces a dependency between the two. Change-Id: I2d4cbee1fd3555411c18833bbee0201c994a9942 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | macOS: Prevent checking for stale SDK without the required SDK nameTor Arne Vestbø2018-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | There's no need to check the SDK at the root exclusive-build Makefile, we can leave it to the individual build passes where the SDK variable is available. Fixes: QTBUG-72449 Change-Id: Ic829babf4c76e6d20812de0b94120199ebfb300c Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | qmake: remove support for pre-5.6 qt module prisOswald Buddenhagen2018-12-201-22/+0
| | | | | | | | | | | | | | it seems rather obsolete by now. Change-Id: I43a84367fbe9f82c3adc0e3825d14198e69eaa1f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | qmake: fix typo in function nameOswald Buddenhagen2018-12-201-6/+6
| | | | | | | | | | Change-Id: Ie88ae0f13be83d6e63078eeb359d9ddf012c94fb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | configure: enable inline tests to refer to PWDOswald Buddenhagen2018-12-191-1/+2
| | | | | | | | | | | | | | ... and use that to inline the xlocalescanprint test. Change-Id: I0973133d7f9ecc9a38b70dc4b83df174a35b2b1f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | configure: enable inline tests to contain auxiliary filesOswald Buddenhagen2018-12-191-0/+5
| | | | | | | | | | | | | | ... and use that to migrate the pch test. Change-Id: I2ce884442cab6124c37142f571cf6f82191ee4f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | configure: enable sharing of inlined source code between testsOswald Buddenhagen2018-12-191-18/+41
| | | | | | | | | | | | | | | | | | this is implemented by means of (multiple) inheritance, which applies specifically only to the inlined source and header list, but not to library sources or dependencies. Change-Id: I8f1d5b34d1d2d12e39225dc50357ad6ec648c6b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | configure: normalize dashes to underscores in exported librariesOswald Buddenhagen2018-12-193-12/+13
| | | | | | | | | | | | | | it works without it, but technically speaking it's undefined behavior. Change-Id: Icdcdd5b923ce4cecd9dc9e75f9d5d66d0fa8a032 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | configure: add support for multiple libdirs in inline library sourcesOswald Buddenhagen2018-12-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | while the command line doesn't actually permit it (that can be re-evaluated separately), derivatives of the inline source type may want to inject additional paths, as is the case with opcua. the incdir field supports multiple entries without additional action. Change-Id: I3860ca1fc8fab25c04eb63bdb2f855b77ff3b9a4 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 01:29:02 +0000