summaryrefslogtreecommitdiffstats
path: root/qmake/doc
Commit message (Collapse)AuthorAgeFilesLines
* doc: Mention qmake6 as name of qmake executable on LinuxKai Köhne4 days1-0/+6
| | | | | | | Task-number: QTBUG-89170 Pick-to: 6.1 Change-Id: I16c86f04b4c34e7099c220cf028ba1cdb20550e9 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Name section 'Getting started with qmake'Kai Köhne2021-04-221-5/+5
| | | | | | | | | | Other manuals have a 'Getting started' section too. Better to qualify it further, so that searching in the Index of Qt Creator Help mode or Qt Assistant allows to differentiate between the different products. Pick-to: 6.1 Change-Id: I7cfdba3c3567bdf49d3fe34307576f88c9f20126 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qmake: Update documentation that c++17 is the defaultKai Köhne2021-02-191-2/+2
| | | | | | | Since commit 4933a5f8923, CONFIG contains C++17 by default. Change-Id: I1033c256242c03d79a643c12a63d17eb9f4c705f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* qmake: Introduce QT_HOST_LIBEXECS propertyJoerg Bornemann2021-02-181-0/+3
| | | | | | | | | This will be used to access host tools that are installed in ${prefix}/libexec instead of ${prefix}/bin. Pick-to: 6.1 Change-Id: I36c4b5736330f8229d267a117c65d55cd5e12758 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update name of c++2a to c++20Kai Köhne2021-02-101-4/+5
| | | | | | | | | | Keep the c++2a feature, but make it an alias for compatibility purposes. Pick-to: 6.1 Change-Id: I6f153109be84659806f1b7a57a88a187875166d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* qmake: Introduce compile_included_sources CONFIG optionJoerg Bornemann2021-02-081-0/+3
| | | | | | | | | | | 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. Pick-to: 5.15 Fixes: QTBUG-90801 Change-Id: I60c997938895f3a743d32ea385efdbe6bcf315bb Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Change android target SDK version to 29Fabio Falsini2020-11-261-1/+1
| | | | | | | | | Play Store now accept only app with target SDK version set to 29 or above Pick-to: 6.0 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. Pick-to: 5.15 Change-Id: Ia7ba3bac47c310bc035620583b9d2102fdc5ffb0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Android: recommend against using ANDROID_ABIS inside the project fileAssam Boudjelthia2020-11-101-7/+3
| | | | | | | Pick-to: 5.15 Task-number: QTCREATORBUG-24674 Change-Id: Iad6baa1af61d3d1a44f26cb9d51e3cb97d235707 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: fix documentation about ANDROID_EXTRA_LIBSAssam Boudjelthia2020-11-021-8/+13
| | | | | | | | | ANDROID_ABIS should be used instead of ANDROID_TARGET_ARCH. Fixes: QTBUG-81866 Pick-to: 5.15 Change-Id: I6dc9e0cd2a19bea8864e3ab4174bd609c0aad4dc Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-031-1/+1
| | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: Ibb68947289be1079911b34ea157bf089cc52c47f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: set default API level to 23 in docsAssam Boudjelthia2020-09-231-1/+1
| | | | | | | | | Android minimum API level for Qt 6 is 23, this reflects that to some instances that still mention 21. Change-Id: I996f3ed3af14dca114129351d6ea06afcb8f45f5 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: add option to get app arguments with AndroidManifest.xmlAssam Boudjelthia2020-08-281-0/+13
| | | | | | | | | | | AndroidManifest.xml file and the Android plugin already has a way to provide commandline-arguments to app with the tag "android.app.arguments". This change allow to set it from qmake/cmake and allow Qt Creator to use that. Task-number: QTCREATORBUG-23712 Change-Id: I3e680f40fd36ba6aaac7f344fb9509d2c3360e74 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* 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. Pick-to: 5.15 Fixes: QTBUG-60022 Change-Id: I949cd73f65f86d4902eeab41fa7e5c6e6ffe44c3 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Doc: Drop dependency on qtgraphicaleffectsPaul Wicking2020-08-201-1/+0
| | | | | | | qtgraphicaleffects is not part of 6.0, drop the doc dependency. Change-Id: I64a355860e0a3a92fa0ffe5ed960796f2e756d61 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Document qmake variable ANDROID_TARGET_ARCHKai Koehne2020-08-191-8/+8
| | | | | | | | | ANDROID_ABI is only available in CMake. In qmake, the variable is called ANDROID_TARGET_ARCH. Fixes: QTBUG-85542 Change-Id: I0f3f7320b08a4fe6448dd40c294254c644cfb3ee Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* iOS: Add a variable to customize where the launch image is taken fromAndy Shaw2020-07-221-0/+10
| | | | | | | | | | | | | For those who are providing their own launch images for their iOS projects then QMAKE_IOS_LAUNCH_SCREEN can be set to point to the location where the launch image to be used over the default. [ChangeLog][Platform Specific Changes][iOS] Added support for specifying a launch image to be used for an iOS project. This can be achieved by using QMAKE_IOS_LAUNCH_SCREEN. Change-Id: Ibb236655b282132ab5eee747986a93abb9802200 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Move QRegExp and its remaining mentions out of QtCoreSona Kurazyan2020-07-131-1/+2
| | | | | | Task-number: QTBUG-85235 Change-Id: Ibd6c98d952c1bb9916b64715c6430fb0d3fe3843 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove winrtOliver Wolff2020-06-061-169/+0
| | | | | | | | | Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Remove last remainings of Qt Quick 1 importsKai Koehne2020-05-251-1/+0
| | | | | | | amends e1fd6074935cd0be0 Change-Id: I4587ae287635bc9718325a24bee728f1c1938978 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make utf8_source the default for qmake buildsLars Knoll2020-05-141-2/+2
| | | | | | | | | | | | | | We now assume that source code is encoded in UTF-8 by default on all platforms (and verify this with an auto test). Provide a CONFIG+=no_utf8_source option for backwards compatibility. [ChangeLog][qmake] qmake will tell the compiler that source code is encoded in utf-8 by default. This mainly has an effect on Windows, where MSVC still assumes source code is encoded in the current ANSI code page. Use CONFIG+=no_utf8_source to get back the Qt 5 behavior. Change-Id: I6dcafcaeefdea7d3907ccb723aeb7d23ccc0f04f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Android: add ANDROID_ABIS qmake snippetAssam Boudjelthia2020-05-131-0/+10
| | | | | | | | | | Add snippet on how to use ANDROID_ABIS inside the .pro file. Pick-to: 5.15 Task-number: QTCREATORBUG-24014 Change-Id: Id3bb960c04ea6480b06878121ad33f89c03e5642 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qmake: Fix handling of manifest file of msvcYuhang Zhao2020-05-111-2/+10
| | | | | | | | | | | | | 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>
* Add more entries for QMAKE_TARGET_XXXYuhang Zhao2020-05-051-2/+38
| | | | | Change-Id: I1cf4a8f19ec47247fbe469b9cc81ed80f6ba5a82 Reviewed-by: Alexandru Croitor <alexandru.croitor@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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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>
* Doc: Fix qdoc compilation errors qtbaseNico Vertriest2019-12-121-1/+1
| | | | | | Task-number: QTBUG-79824 Change-Id: I6557de598de1931fc30556951d35783d02b83abe Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Fix QMAKE_EXTRA_TARGETS snippet descriptionJoerg Bornemann2019-10-101-1/+1
| | | | | | | | | The snippet uses the Unix touch command, not qmake's touch function. Change-Id: I71d1460447249b8941ce4bdbb494bb419e13b119 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Document CONFIG values that are worth documentingJoerg Bornemann2019-09-271-0/+18
| | | | | | Fixes: QTBUG-538 Change-Id: Id06e316e7ae3d59b63b256ef565a1ad6dc5d9dd2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qmake: Replace WinRT with UWP in the qmake ManualLeena Miettinen2019-09-201-29/+22
| | | | | | | | Remove info about Windows Phone, which is no longer supported. Task-number: QTBUG-61884 Change-Id: Ic330f0f19a4e7314dd175f6c492fa25133185517 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Ignore non-existent .ui file dependenciesJoerg Bornemann2019-09-181-0/+5
| | | | | | | | | | | | | | Commit 80dea664 broke .ui files with global includes that are not part of the project, because we blindly added every file path that falls out of 'uic -d' as dependency. Introduce the extra compiler CONFIG flag dep_existing_only to bring back the old behavior that ignores non-existent dependencies and set it for uic. Change-Id: I6eaa82817c932a98ebac6d08115a9815d4b9dd21 Fixes: QTBUG-78144 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Make it possible to undefine NDEBUG for nmake and VS projectsJoerg Bornemann2019-09-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | For nmake and VS projects we added the NDEBUG define for the release configuration unconditionally within the qmake generators. To undefine it, users had to use a nasty work-around. Now, define NDEBUG within the MSVC mkspecs. In order to do that we introduce the DEFINES_RELEASE and DEFINES_DEBUG variables that are merged into DEFINES in default_pre.prf. Users can unset NDEBUG by writing DEFINES -= NDEBUG in their .pro file. Note that DEFINES_RELEASE and DEFINES_DEBUG are merged in default_pre.prf in order to give extra compilers (like moc) the chance to see the fully resolved DEFINES variable. This is different from the QMAKE_CFLAGS_(DEBUG|RELEASE) variables that get merged in default_post.prf. Fixes: QTBUG-78071 Change-Id: I381770a1d2f974fbae9b09a2254e3f2fc7842b68 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-121-5/+5
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/arch/write_info.pri Repair architecture config test for the WASM_OBJECT_FILES=1 build mode configure.pri tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp Done-With: Jörg Bornemann <joerg.bornemann@qt.io> Change-Id: I9e12088356eb5bc65b53211cd7a8e330cccd1bb4
| * Doc: Extend QMake's documentation of RC_FILE and RES_FILEJoerg Bornemann2019-08-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RC_FILE is not an internal variable that "rarely needs to be modified". Mention that it's about Windows resources and link to the corresponding section. RES_FILE: Add link to RC_FILE and the more general section. Also rephrase "compiled Windows resource file" to "Windows resource compiler's output file" which is more precise. Fixes: QTBUG-8709 Change-Id: I19c61e6a9505d45fc13fefbcd0ba9441191aa42e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com>
* | doc: Explain how qmake finds for files included in your source codeKavindra Palaraja2019-05-161-2/+3
| | | | | | | | | | | | Task-number: QTBUG-26651 Change-Id: Icc09e3272fcec8af0c33d79655159d13183c66ce Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Add the c++latest CONFIG value to select the latest C++ standardJoerg Bornemann2019-05-141-0/+3
| | | | | | | | | | | | | | | | | | [ChangeLog][qmake] The CONFIG value c++latest was added to select the latest C++ standard the currently used toolchain supports. Task-number: QTBUG-75653 Change-Id: I22ddc9d293109d99e652b7ccb19d7226fca4716d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-091-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale_data_p.h (Regenerated by running the scripts in util/local_database/) src/gui/opengl/qopengltextureuploader.cpp Done-With: Edward Welbourne <edward.welbourne@qt.io> Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io> Change-Id: I12df7f066ed0a25eb109f61c4b8d8dea63b683e2
| * qmake: Document DESTDIR deficienciesKai Koehne2019-05-081-0/+4
| | | | | | | | | | | | | | Fixes: QTBUG-75261 Change-Id: I8d0635a914785171cdee1bf691f773d4c356c6c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: Document the c++2a CONFIG valueJoerg Bornemann2019-05-081-0/+3
| | | | | | | | | | Change-Id: Ia4d84ac141b6fb27b244dfb8272b8039e337a9e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | doc: Document the effect of *.qmake.cache properlyKavindra Palaraja2019-04-291-1/+4
| | | | | | | | | | | | | | | | Added a sentence to explain how a .qmake.cache file influences the project root. Task-number: QTBUG-21411 Change-Id: I97766edd96851f1c988ab07f842fb81a339e4ecd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>