summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Explicitly set input files for qtpreprocessChristoph Keller2021-04-121-0/+9
| | | | | | | | | | | | | This fixes build errors with Xcode 10. Xcode 10 build system (a.k.a "New Build System") needs to know the input files in order to build a correct dependency graph. Especially when a build is not run for the first time and files changed in-between. Task-number: QTBUG-71035 Change-Id: If8fbad3a1915add9b35c79131b03cdbe6b7ac06d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 8115219407fdbe7c01e97c76ccf3aa48b1fd8f78) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Explicitly set output files for qtpreprocessNikolay Avtomonov2021-04-071-1/+7
| | | | | | | | | | | | | This fixes build error with XCode 10. XCode 10 build system (a.k.a "New Build System") requires all the files that are generated by scripts and used later on build to be explicitly defined as output files. Task-number: QTBUG-71035 Change-Id: Ibec39eee53b0cb3acecf592f1ca53c04b9975cad Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 3f0858ed10d249acb942597b4065080411281b87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix typo in publisherid for WINRT_MANIFESTAndy Shaw2021-04-071-1/+1
| | | | | Change-Id: Ie38d47e1473c27b6c7e25bbfcb59208d51b73c26 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qmake: Introduce compile_included_sources CONFIG optionJoerg Bornemann2021-02-083-4/+13
| | | | | | | | | | | | By default, qmake does not compile source files that are included in other source files. The new CONFIG option compile_included_sources disables this behavior. Fixes: QTBUG-90801 Change-Id: I60c997938895f3a743d32ea385efdbe6bcf315bb Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 134ee7d932391c7b3c1b801e64e4f5693c3cdd20) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update commercial license headers to \bin, \mkspecs, \qmakeTarja Sundqvist2021-01-2857-570/+570
| | | | | | | | | | | | | | | Update header.COMM to the files in tqtc-qtbase\bin, tqtc-qtbase\mkspecs and tqtc-qtbase\qmake. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4154 Change-Id: I00a45e3989416057c28c90d1107c27ee0b8cbf29 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add new way to mess up projects with QMAKE_INSTALL_REPLACEMichal Klocek2020-11-302-5/+14
| | | | | | | | | | | | | | | | | | | | | Qmake supports currently: * QMAKE_PRL_INSTALL_REPLACE, * QMAKE_LIBTOOL_INSTALL_REPLACE * QMAKE_PKGCCONFIG_INSTALL_REPLACE Introduce QMAKE_INSTALL_REPLACE, where more sed magic can be put in action in more generic manner. replace_foo.filename = foo.h replace_foo.matches = /bad/looking/path/to/foo replace_foo.replace = /awesome/looking/path/to/foo QMAKE_INSTALL_REPLACE += replace_foo Task-number: QTBUG-87154 Change-Id: Ie43d0ab4f1d4575bbf6279eb36383f38047484d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 632da28e9ca1d67639f60e4c20ca54b38ae10dcd)
* Minor refactor of installMetaFileMichal Klocek2020-11-302-20/+27
| | | | | | | | | | | Move some lines into createSedArgs. This is used in follow up patch. Task-number: QTBUG-87154 Change-Id: I226f4aad4aaf703a4726c42b40afb4bde3a9d878 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 9bade12c2ca78a2dc5effda568342ae11adb0f42) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change android target SDK version to 29Fabio Falsini2020-11-271-1/+1
| | | | | | | | Play Store now accept only app with target SDK version set to 29 or above Change-Id: If38f20c88fd6b0e6f29939cdf3d2eb793c0e1489 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Doc: Fix documentation of qmake's exists() functionJoerg Bornemann2020-11-241-2/+3
| | | | | | | | | | This function may take a wildcard expression, not a general regular expression. Change-Id: Ia7ba3bac47c310bc035620583b9d2102fdc5ffb0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 116c2115f84ec2f5f12b5d7680cd83ceeef72a6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: recommend against using ANDROID_ABIS inside the project fileAssam Boudjelthia2020-11-131-7/+3
| | | | | | | | Task-number: QTCREATORBUG-24674 Change-Id: Iad6baa1af61d3d1a44f26cb9d51e3cb97d235707 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 0d6a14bbd992977b5ba07ba4134b1ad68dc4656a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: fix documentation about ANDROID_EXTRA_LIBSAssam Boudjelthia2020-11-021-0/+13
| | | | | | | | | | ANDROID_ABIS should be used instead of ANDROID_TARGET_ARCH. Fixes: QTBUG-81866 Change-Id: I6dc9e0cd2a19bea8864e3ab4174bd609c0aad4dc Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 75d32a195a1dbba42756353ee1705b709bfab002) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake/vcxproj: Fix handling of extra compiler outputsJoerg Bornemann2020-11-021-1/+1
| | | | | | | | | | | | | | | In commit 68866b1a7bcade79e425f609fc1680203b89112e we introduced a bug: At a point where the first output of an extra compiler is extracted, we try to evaluate the first output as qmake variable. This is as nonsensical as it sounds and leads to malformed extra compiler output in vcxproj files. Task-number: QTBUG-87601 Change-Id: Ib9aaf8a6eed8c69243f364554325c240d0bfc7f4 Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 93ac7b9d174d8ba2fcd9762c3ac836c3a1b000f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Make use of QHash deterministicKai Koehne2020-09-191-1/+3
| | | | | | | | | | As a build tool, qmake should produce deterministic outputs. Task-number: QTBUG-86675 Change-Id: Ifc855d6ddf025cdad3aa57aee79beabf9c6008e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit cccace0c10d1b7d21cea00bd9f1b5169c1bbf007) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Support multiple /MERGE:from=to options in MSVC generatorJoerg Bornemann2020-09-191-1/+7
| | | | | | | | | | | | | Any but the last /MERGE:from=to option passed to QMAKE_LFLAGS was ignored. Now, the first options gets a <MergeSections> tag and all further options are added as AdditionalOptions, because vcxproj files / the VS property editor do not support multiple MergeSections entries. Fixes: QTBUG-86062 Change-Id: I65bddf0b8c7ed6c162008d6ad1b58c2aba2d07d9 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 2cbeacd2cd1a32fda5ef7705e270c71b2ed3c369) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Improve documentation of ANDROID_EXTRA_PLUGINS qmake variableTopi Reinio2020-08-251-4/+35
| | | | | | | | | | | | Clarify that the variable must point to a directory with a specific structure, and how the name mangling is applied to the deployed plugins. Fixes: QTBUG-60022 Change-Id: I949cd73f65f86d4902eeab41fa7e5c6e6ffe44c3 Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit 1ff82d1ebaa7b9151bab449fd29b76d59654037b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Stop using -isystem flagDmitry Shachnev2020-06-252-14/+3
| | | | | | | | | | | | | | This option changes the order of include paths, which can cause problems of various kinds. See https://bugs.debian.org/958479 for an example. The benefit of that option is minimal for what it was intended. Additional change added when cherry-picking: build the GTK platformtheme with -Wno-error=parentheses flag, to fix GCC errors with GTK < 3.23. Change-Id: I80eeabd09764df290b60bc59aeb2f90d07723608 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit f133b226cdf4f2736b412bb642b45d43cb84f51d)
* qmake: Fix handling of manifest file of msvcYuhang Zhao2020-06-035-15/+11
| | | | | | | | | | | | | | Setting the QMAKE_MANIFEST variable doesn't have any effect for MSVC. This commit fixes that. If the developer is setting this variable, he/she will definitely use CONFIG-=embed_manifest_exe or CONFIG-=embed_manifest_dll at the same time, so I think there is no need to check this. Change-Id: Ie32b7e0cded71efcf14bf4c0eecab5ab1944fa2c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ef8640596c77dfd25ac0fe790bf265e581da29b1)
* Android: add ANDROID_ABIS qmake snippetAssam Boudjelthia2020-05-181-0/+10
| | | | | | | | | | | Add snippet on how to use ANDROID_ABIS inside the .pro file. Task-number: QTCREATORBUG-24014 Change-Id: Id3bb960c04ea6480b06878121ad33f89c03e5642 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 4ff5c8b9545d45c02e62b2b1c0b11f00971c0c64) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Use QMAKE_TARGET for the name of the object script fileAndy Shaw2020-04-281-1/+1
| | | | | | | | | | Since TARGET at this point contains the path to where the target will be then it can include ".." as part of it which will cause problems when building for Android on Windows. Therefore, QMAKE_TARGET should be used as an identifier here as the path is not needed. Change-Id: Idb8babd0459c65cbcfd64fe47baeac4303a3fd87 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: update Android specific variables docsAssam Boudjelthia2020-04-171-0/+188
| | | | | | | | | Android variable are missing from the list of QMake variables... Task-number: QTBUG-80390 Change-Id: Ic10f96687334eea99c0302d7137685b1bf6e56c6 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qmake: Document QML_FOREIGN_METATYPESUlf Hermann2020-03-261-0/+8
| | | | | | Task-number: QTBUG-82709 Change-Id: I0ca648114adbbed1ab3c6406e9f14f60f7924e96 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Remove \contentspage commandsTopi Reinio2020-03-151-14/+0
| | | | | | | | The command is deprecated and has no effect apart from generating a documentation warning. Change-Id: I30871bfd6975f8268930cce99993a8579242fdb8 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* macOS: Merge qcore_mac cpp and mm filesTor Arne Vestbø2020-03-123-8/+3
| | | | | | | | Files ending with .mm are Objective-C++ files, so we don't need a separate file for the C++ parts. Change-Id: I3ef52bc98291fd461b889978a538e81630d17c6e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* qmake: Document qmltypes and metatypesUlf Hermann2020-03-091-0/+35
| | | | | | | | Task-number: QTBUG-81615 Fixes: QTBUG-82305 Change-Id: I0a411ff2ebc2dbf5462fa110b1eb70a1876b6ae5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* QMake: Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-02-285-8/+8
| | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I3f1b836cfb47bba0fdc27f2c3aa7b0576d123dca Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-02-183-0/+20
|\ | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlinkedlist.h src/plugins/platforms/wasm/qwasmintegration.cpp src/plugins/platforms/wasm/qwasmscreen.cpp Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
| * Windows: Add install/uninstall rules for target.targetsKai Koehne2020-02-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirror the behavior in unixmake.cpp and do actually install /uninstall files in target.targets. This fixes the installation of .debug files on MinGW for a Qt with -force-debug-info -separate-debug-info. [ChangeLog][qmake] Install/uninstall rules are now generated for target.targets on Windows. This mirrors the behavior on Unix. Fixes: QTBUG-81354 Change-Id: Ie9366f132ebd8e18680f32f2e52cec64dbd87e9a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * qmake: Allow the use of a response file when building a libraryAndy Shaw2020-02-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Change b274f656b82e06fad492e241dae6ae65cb377ad1 enabled the use of a response file for application building specifically needed when building an application for Android on Windows. The same cause can happen when building a library too with a lot of object files, so the command for the link step can be too long. So we expand the functionality to be used for libraries too. Task-number: QTBUG-71940 Change-Id: Ia6d1943bf33f6decb53f6e71a8dc65310d2f20a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Doc: Document some missing CONFIG valuesYuhang Zhao2020-02-131-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-81035 Change-Id: I1976e700aa9cfcc32ad8cb1d4fae5b2d7497c429 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-121-1/+3
|\| | | | | | | Change-Id: I8caee4d1ce0eed27d905194df3c3d46c5d07d2b0
| * Doc: Document the ltcg CONFIG valueJoerg Bornemann2020-02-101-1/+3
| | | | | | | | | | | | Fixes: QTBUG-81035 Change-Id: I41bff3aef3ac0ce7c117ab2245491dceb6f2685b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-041-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/widgets/widgets/imageviewer/imageviewer.cpp src/corelib/text/qchar.cpp src/corelib/time/qdatetime.cpp Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a
| * Fix line ending in custom build steps of vcxproj filesJoerg Bornemann2020-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | We must use Windows line endings in .vcxproj files to separate command lines of custom build steps. This amends commit f65cfadd. Fixes: QTBUG-81553 Change-Id: I8d257f3846af7006df7f8d462b8f44efdce6a1fd Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-2/+5
|\| | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301
| * Fix handling of the DEFINES_DEBUG/DEFINES_RELEASE variablesJoerg Bornemann2020-01-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications of the CONFIG variable in the project file wasn't taken into account in the handling of DEFINES_DEBUG and DEFINES_RELEASE, because it was happening before the evaluation of the project file. Moved the handling code into default_post.prf where the other *_DEBUG and *_RELEASE variables are handled. In practice that means: to avoid the addition of the NDEBUG define one has to remove NDEBUG from DEFINES_RELEASE. This amends commit 1456b809. [ChangeLog][qmake] To remove the NDEBUG define that is added by default in MSVC mkspecs, write DEFINES_RELEASE -= NDEBUG in your .pro file. Fixes: QTBUG-81569 Change-Id: I2ea5628653275a4e48ad002977d34969c0663815 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Purge the dep_cd_cmd parameter from callExtraCompilerDependCommandJoerg Bornemann2020-01-244-19/+8
| | | | | | | | | | | | | | | | | | | | | | We always pass the same value. The builtins are also using exactly this "cd command" unconditionally. This deduplicates the code at the call sites of callExtraCompilerDependCommand a bit. Change-Id: I5c412c815d50afdac55e1b45021f37f2545ce8f0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | De-duplicate the last occurrence of calling a depend_commandJoerg Bornemann2020-01-241-28/+16
| | | | | | | | | | | | | | | | | | | | | | Use the central callExtraCompilerDependCommand in the last place where the code to call an extra compiler's depend_command was duplicated. Note that this is in the "Bad hack" section. We're making this hack less bad, but the comment still applies. Change-Id: Iaa857af20ca46b2d73053d3e264c63124c87a41b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-182-3/+3
|\| | | | | | | Change-Id: I12148e7b20bcdb72d9b328035d528c99633b1e92
| * Doc: Fix qdoc compilation errors qtbaseNico Vertriest2020-01-172-3/+3
| | | | | | | | | | | | Task-number: QTBUG-79824 Change-Id: I5a39525e3e735415ba96e2d585c5de754deb15de Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-153-9/+27
|\| | | | | | | Change-Id: I8dbcf23835d52d3aa7d018ed250814d60c68aa83
| * Fix mkdir warning for object_parallel_to_source projectsJoerg Bornemann2020-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | Source files that are right next to the project file result in an empty "object subdirectory" if object_parallel_to_source is set. We must not attempt to create empty directories. Fixes: QTBUG-81271 Change-Id: I431f9fbe46f50fbbaa5d6a59966bfb059418036c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * doc: improve SUBDIRS documentation for dependency handlingSamuel Gaist2020-01-142-8/+26
| | | | | | | | | | | | | | | | | | | | The use of the 'ordered' CONFIG option is known to not be efficient for multi-core builds. This patch updates the documentation with an example using the .depends modifier as well a discourage the use of 'ordered'. Change-Id: I3575243a7c4138f0671d171441c932c3ad89a411 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-01-092-0/+32
|\| | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp Change-Id: I4780b25665672692b086ee92092e506c814642f2
| * Doc: Extend the documentation about qmake scopesJoerg Bornemann2020-01-092-0/+32
| | | | | | | | | | | | Fixes: QTBUG-18025 Change-Id: I2b587266cde2002d965dc824a869be255cf3522e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-094-29/+17
|\| | | | | | | Change-Id: I9b4816b4aa6f0c51a446742db58b9d0dcf69aa09
| * Fix dependency resolution for extra compilers in VS projectsJoerg Bornemann2020-01-074-29/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | De-duplicate the code that calls the extra compiler's depend_command by using the central function callExtraCompilerDependCommand. This one actually tries to resolve dependencies unlike the removed code that blindly resolved relative paths to the build directory. This fixes dependencies reported by uic which need to be resolved against what is in DEPENDPATH. Fixes: QTBUG-80579 Change-Id: If482e50ff3eff716fefffee82004acc076b3a547 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-071-0/+6
|\| | | | | | | Change-Id: I6c81e3cb6272adc5c3de2513792bd48604ff4dd0
| * qmake: Document QML_IMPORT_PATHKai Koehne2020-01-061-0/+6
| | | | | | | | | | | | | | | | qmake itself does not use the variable, but Qt Creator does. Fixes: QTBUG-77866 Change-Id: I313d1ebe32dbc1eeac8d2d79b519349c7097a5a6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-272-5/+6
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/platforms/xcb/qxcbscreen.cpp src/widgets/accessible/qaccessiblewidget.cpp Change-Id: Ib3138e61ba7981610940509a7ff02ba2dd281bf0
| * Doc: Fix name of no_check_exist flagUlf Hermann2019-12-231-1/+1
| | | | | | | | | | | | | | There is only one 's' in there. Change-Id: I02288c138784086e535c339660b02bf9c33f8fda Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 12:41:08 +0000