summaryrefslogtreecommitdiffstats
path: root/qmake/doc
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-261-0/+2
|\| | | | | | | Change-Id: I6ecf7074eda57ef4954fb3fdc7a6d1e8cd229340
| * Doc: Document qmake's plugin_bundle CONFIG valueJoerg Bornemann2019-04-241-0/+2
| | | | | | | | | | | | | | | | Fixes: QTBUG-17171 Change-Id: I05bf6ba7498fb05394ff8c118973da2b0dbe4fc3 Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-241-0/+22
|\| | | | | | | Change-Id: I26da00aa71b0f0b91c9bfb4a9e8550345ee62875
| * Doc: Document QMAKE_[L|C[XX]]FLAGS_RELEASE_WITH_DEBUGINFOJoerg Bornemann2019-04-181-0/+22
| | | | | | | | | | | | Fixes: QTBUG-17463 Change-Id: Ic2f0870da14db21b1da053716b6d63ba0ed679c9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | doc: Explain the config members for INSTALLSKavindra Palaraja2019-04-231-0/+35
| | | | | | | | | | | | Task-number: QTBUG-3209 Change-Id: I00f181a9f29d4ae440a9ad6a2d99877cab482db8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | doc: Add clang to the Unix list for Precompiled Headers documentationv5.13.0-beta3Kavindra Palaraja2019-04-151-0/+1
| | | | | | | | | | | | Task-number: QTBUG-50011 Change-Id: I18261e62e387eeb74fc7584bf034a11ac75db1be Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-051-0/+64
|\| | | | | | | Change-Id: I010a6322d12e038fdce247a58dfb05e204c2ff3b
| * Document in which Qt version a qmake function was introducedJoerg Bornemann2019-04-031-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | ...starting with Qt 5.0.0. The text is manually inserted there, because \since does not work within sections. Task-number: QTBUG-74737 Change-Id: I0fe2d0a113d48be0266030c8466b062c6f743aab Reviewed-by: Robert Szefner <robertsz27@interia.pl> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-191-4/+7
|\| | | | | | | Change-Id: Ifa143cc462301aaa305c9c85360e543553a751f0
| * Add cmdline feature to qmakeJoerg Bornemann2019-02-181-4/+7
| | | | | | | | | | | | | | | | | | [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>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-071-0/+11
|\| | | | | | | Change-Id: Ieb57137ee2b7d0c505e3531d5aa1bcb66978847e
| * qmake: add $$read_registry() functionOswald Buddenhagen2019-01-051-0/+11
| | | | | | | | | | Change-Id: I7f9f17e0f44c273e4754d1decc92a8594cad8658 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-131-1/+1
|\| | | | | | | Change-Id: I0fe623517af28e408b642c879efd59f633ab63ac
| * Doc: correct syntax error in qmake manualNico Vertriest2018-12-121-1/+1
| | | | | | | | | | | | Change-Id: I600f8c9ea8e55dad19345bd4d726cf8d5438e9ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Enable users to specify WindowsTargetPlatform[Min]Version in VS projectsJoerg Bornemann2018-11-161-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][qmake] Introduced the variables WINDOWS_TARGET_PLATFORM_VERSION and WINDOWS_TARGET_PLATFORM_MIN_VERSION for overriding the default values of WindowsTargetPlatformVersion and WindowsTargetPlatformMinVersion in Visual Studio project files. The code to determine the default values is moved to qmake feature files. A common/windows-desktop.conf file is introduced for variables common to all non-UWP Windows mkspecs. The package_manifest feature uses WINDOWS_TARGET_PLATFORM_VERSION as default value for WINRT_MANIFEST.minVersion, and WINDOWS_TARGET_PLATFORM_MIN_VERSION for WINRT_MANIFEST.maxVersionTested respectively. Task-number: QTBUG-53654 Change-Id: I251ec7f9b804c9bc9f7d571f5b43d52b2a2d99d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-11-101-0/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/serialization/qcborcommon.h src/corelib/tools/qlocale_data_p.h tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: Ibed987f6d77a0294f78f67d78625237616082416
| * Doc: Add description for mode argument of qmake's $$system()Paul Wicking2018-11-021-0/+5
| | | | | | | | | | | | | | Fixes: QTBUG-70926 Change-Id: Icfd13352cd64053c11502058188041ad16f6c287 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Generate documentation .tags files for all of the docsFrederik Gladhorn2018-10-311-0/+2
|/ | | | | | | | | | | This allows others to link to QtDBus and the other libraries/tools using doxygen. Fixes: QTBUG-60933 Change-Id: I026895a432a328f224c40cf231ad12d109dc648f Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* qmake: Add support for CONFIG += c++17Kai Koehne2018-10-151-0/+1
| | | | | | | | | | | The correct name is c++1z. Anyhow, this is easy enough to get wrong, so make sure CONFIG += c++17 works as well. Task-number: QTBUG-67527 Change-Id: Iea26b18824b38b1b5170f85987cf5c750b8e10ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* qmake: fix the precedence of QMAKE_LIBDIR_POSTv5.12.0-beta2Oswald Buddenhagen2018-10-121-1/+13
| | | | | | | | | | | it must end up in front of QMAKE_LIBS{,_PRIVATE}, but not of LIBS{,_PRIVATE} (which are preceded by QMAKE_LIBDIR). Task-number: QTBUG-61982 Started-by: Liang Qi <liang.qi@qt.io> Change-Id: Id3de01ee0e9b66af02f79949aeb5a0eabd55363f Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* qmake: document {,QMAKE_}LIBS_PRIVATEOswald Buddenhagen2018-10-121-0/+23
| | | | | | Change-Id: I6637d5f57d372f63b3cfaeb28c7e48c940887db6 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* qmake: make sure QMAKE_LIBS{,_PRIVATE} comes after LIBS{,_PRIVATE}Oswald Buddenhagen2018-10-121-5/+7
| | | | | | | | | | the early merging of LIBS* into QMAKE_LIBS* meant that we could not interleave them properly. defer the merging until the points of use. Task-number: QTBUG-70779 Started-by: BogDan Vatra <bogdan@kdab.com> Change-Id: I890f98016c3721396a1f0f6f149a9e2b37d56d8e Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge branch '5.11' into devEdward Welbourne2018-07-311-11/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakebuiltins.cpp src/plugins/platforms/windows/qwindowstabletsupport.h src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Done-With: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
| * Doc: Fix typos and grammar in qmake variable referenceKai Koehne2018-07-271-11/+11
| | | | | | | | | | Change-Id: I2e039ed1383c9d7fec61b378c5ca8e99fbbf1911 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qmake: Add support for running lreleaseKai Koehne2018-07-281-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG+=lrelease enables that all .ts files in TRANSLATIONS or EXTRA_TRANSLATIONS are compiled by lrelease. EXTRA_TRANSLATIONS is a new variable that is only processed by lrelease, but not lupdate - this is useful for translation files that are supposed to be empty, because they match the language of the original translation sources. If embed_translations is also set, the generated .qm files will be made available through the Qt resource system under :/i18n/. Alternatively, the user can specify an installation target by setting QM_FILES_INSTALL_PATH. Note that relative paths in TRANSLATIONS are not taken into account. That is, TRANSLATIONS = component1/de.ts component2/de.ts will cause a conflict. [ChangeLog][qmake] New CONFIG options lrelease and embed_translations were added. CONFIG+=lrelease does run lrelease on translation files listed in TRANSLATIONS and EXTRA_TRANSLATIONS. CONFIG+=embed_translations does include the generated .qm files as resources under :/i18n/. Change-Id: I94db5b8431d07b24f59b2c332ede91450f9c0c58 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qdoc: Fix CONFIG documentation tableKai Koehne2018-07-251-2/+2
| | | | | | | | | | | | | | | | Amends 591edbb11c Change-Id: Ic31d733a1f2d386daa05afa865cb61a987f45578 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qmake: add line-based mode for .depend_commandsOswald Buddenhagen2018-07-231-0/+5
| | | | | | | | | | | | Task-number: QTBUG-48919 Change-Id: I6988fb2f26fd62ab40eb7392ccb0e033ad291fe6 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | uic: Revert the microoptimization patch introducing QStringLiteralJarek Kobus2018-07-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts the following commits: d12d2949d1e4ac08a47928ef27bc45459b3fb104 26c3bec09bccf9006f5ef4945a428d9ef56c1d12 49b08f96e824f49fab9aa5c9a1a0ed582d4558bb We can't easily predict all code paths for QDesigner with such a microoptimization. We also don't want to generate three different string constructions depending on some sophisticated heuristics. [ChangeLog][uic] The -no-stringliteral option is now deprecated and UIC will not generate QStringLiteral anymore. Task-number: QTBUG-65251 Task-number: QTBUG-51602 Change-Id: I34a5a1934a8df19c5c84ac2ba8e5168ce5665037 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: Mårten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
| * Fix function nameJesus Fernandez2018-06-211-1/+1
| | | | | | | | | | | | | | Replace QDir::makepath with QDir::mkpath. Change-Id: Iec91fc332393255843bad915c1064587b5fe543d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Detect C standard and try using the most recent one (take 2)Allan Sandfeld Jensen2018-04-211-3/+16
|/ | | | | | | Fixes the default C version used with gcc < 5 Change-Id: I948dece961caed8e6b181e1c6e6b9dc43c46583e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Make sure $$relative_path() uses an absolute path as its first argEdward Welbourne2018-03-221-4/+11
| | | | | | | | | | | | | | | | Thanks to QTBUG-61373, this qmake function was called with /usr/local/5.10.1 as baseDir, which isn't absolute, leading to an assertion failure. We could raise the error within qmake but it proved easier to simply resolve any non-absolute baseDir using PWD, before trying to use it as an absolute path. Did the same for $$absolute_path(). Documented both. Adjusted the assert that caught this to report any non-absolute path that upsets it. Added simple tests, fixed an existing test. Task-number: QTBUG-66156 Change-Id: Icfef2e2f5b236e071177c9beffa38d71bf404292 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-141-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
| * Document what the QT qmake variable does in more detailMitch Curtis2018-01-241-0/+3
| | | | | | | | | | | | | | | | | | Make it clearer what the variable actually does by mentioning that it makes its headers available for inclusion and causes it to be linked to the binary. Change-Id: I72821d4bceea7a92e91175ba6c5acc4c3377d7b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Doc: Fix typos in qmake function referenceAaron Linville2018-02-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate "for the". Function list was sorted except for sprintf; so sorted it. Also, minor grammatical improvement. Task-number: QTBUG-64362 Task-number: QTBUG-64363 Change-Id: Ia47c5195011a0e578e916897b3a5ddb1d78170ad Reviewed-by: Frederik Schwarzer <schwarzerf@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-12/+0
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
| * | Doc: QMake: Remove dependencies to non-existent documentation modulesTopi Reinio2018-01-121-12/+0
| | | | | | | | | | | | | | | | | | | | | These are no longer part of Qt 5 and produce documentation warnings. Change-Id: I82242b7b03d7ece1b82e2ff75dc6673f471e2df2 Reviewed-by: Martin Smith <martin.smith@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 17:10:23 +0000