summaryrefslogtreecommitdiffstats
path: root/src/tools/qtpaths
Commit message (Collapse)AuthorAgeFilesLines
* qtpaths: Expose new PublicShareLocation, TemplatesLocationKai Köhne2022-01-141-0/+2
| | | | | | | | | | | | | These were added to QStandardPaths in commit 68c4669ce49aad21beff0e8ef0122a86d53b12e2 [ChangeLog][QtCore] PublicShareLocation, TemplatesLocation got added as known locations to QStandardPaths. Task-number: QTBUG-86106 Task-number: QTBUG-78092 Change-Id: I453b6a07dd7775f81f81a1b18fa95f5c1230cb1e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Skip unnecessary commands when cross-building toolsJoerg Bornemann2021-09-271-0/+1
| | | | | | | | | | | | | | | Introduce a new macro qt_internal_return_unless_building_tools which simply calls return() if tools are not built. This macro is supposed to be called after qt_internal_add_tool(). Using this macro avoids having to special-case code for when qt_internal_add_tool() creates imported targets in cross-builds. Adjust pro2cmake accordingly. Task-number: QTBUG-85084 Change-Id: I9e1c455c29535dd8c318efa890ebd739c42effc1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add qtpaths6 aliasKai Köhne2021-07-161-0/+1
| | | | | | | | | | | | | | | | Make qtpaths also available under qtpaths6. In fef850c51a069, qtpaths got extended to replicate the 'qmake -query' behavior. This was meant for IDE's like Qt Creator, so that they can use qtpaths instead of qmake to identify Qt versions. Anyhow, since qtpaths was also available in Qt 5, letting users just select _any_ qtpaths executable won't work for this purpose. Adding qtpaths6 - like qmake 6 - allows IDE's to query for a Qt 6 qtpaths. Pick-to: 6.2 Task-number: QTCREATORBUG-25546 Change-Id: Ifc7e1a76b26cf706872db1bb1f9d3de5f006de24 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qtpaths: Prevent tool messages from appearing in qtbase.tsFriedemann Kleint2021-06-151-30/+29
| | | | | | | | | | The tool used QCoreApplication::translate(), but did not attempt to load a QTranslator. Use QStringLiteral() instead. Pick-to: 6.2 Task-number: QTBUG-75870 Change-Id: Ib3c6b1893889a82b186a310c0c725dbf1a1885b3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Extend qtpaths functionally to replicate the 'qmake -query' behaviorAlexey Edelev2021-03-252-2/+80
| | | | | | | | | | | | | | | | | | | | | | | 'qt-version', 'install-prefix', 'binaries-dir' and 'plugin-dir' are covered by the introduced qt-query option. So make them obsolete and hidden in the application help. Note that the 'qtconf' option will affect the output of options associated with QLibraryInfo. [ChangeLog][Tools] qtpaths got new --qt-query argument that can be used instead of qmake -query. The new --qtconf, --query-format arguments allow you to further tweak its output. [ChangeLog][Tools] The qt-version, install-prefix, binaries-dir and plugin-dir options of the qtpaths tool are deprecated. [ChangeLog][Tools] The qtpaths tool has been moved from the qttools repository to the qtbase repository. Fixes: QTBUG-75870 Change-Id: I949acf79c8ce321811ee81cf707c1ae0eccb547d Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qtpaths: Fix cross compilation for windowsMartin Storsjö2021-03-151-2/+2
| | | | | | | | | | | | The cmake target may not be named "qtpaths", but one should be using ${target_name} instead. If cross compiling, and QT_BUILD_TOOLS_WHEN_CROSSCOMPILING isn't set, the tool won't be built at all and there's no such target to set properties on, and if it isn't set, the target name is something else. Change-Id: I3d904036106b38df6e56ad35d400cf9a0bb1cbdf Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Move qtpaths from qttools repository to qtbaseAlexey Edelev2021-03-122-0/+349
qtpath should replicate the functionality of 'qmake -query'. Also we want this tool to be available in builds without qttools. Task-number: QTBUG-75870 Change-Id: I6578fc4fc45dd940fd353a5cfe6db0a12744230a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>