summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_tool.prf
Commit message (Collapse)AuthorAgeFilesLines
* Windows: Automatically set metadata for all Qt appsKai Koehne2017-07-311-3/+0
| | | | | | | | | Move the logic to set default values for VERSION, QMAKE_TARGET_DESCRIPTION to qt_app.prf. This way, a lot more executables get sane defaults. Change-Id: I8394418c118a8877cec792eddc8894397c0fbf2d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Windows: Simplify generic tool descriptionKai Koehne2017-07-311-2/+2
| | | | | | | | | | | | Make the tool description even simpler so that e.g. moc shows up as "Qt Moc". The 'description' is shown in various places as the mere title, so it shouldn't be too verbose. This augments change ad68bf51e7. Task-number: QTBUG-61970 Change-Id: I4b30b95a10d597a9a8a2c388c2381ea38a340be6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add executable name to description of Qt tools (Windows)Kai Koehne2017-07-191-1/+1
| | | | | | | | | | | | | | | Change f046ed395a5d2c383 set the default values of VERSION and QMAKE_TARGET_DESCRIPTION for Qt tools to generic ones. The version and description is shown in the properties of the executable, but also used for crash reports. For the latter it wasn't clear anymore which tool actually crashed. The patch therefore adds the executable name to the generic description. Tools can still overwrite the description on their own. Task-number: QTBUG-61970 Change-Id: I8366db22f88f0d6575e7f482f030b3c4f05af6c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Set VERSION for Qt toolsJoerg Bornemann2017-07-031-0/+3
| | | | | | | | | This creates a VersionInfo resource on Windows for Qt's tool executables similar to what Qt's DLLs contain. Task-number: QTBUG-55755 Change-Id: I9e5d7bedaec9d14f29a9eeeb6697b07241f860d8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* write HOST_QT_TOOLS to qmodule.pri instead of qhost.priOswald Buddenhagen2016-12-131-1/+1
| | | | | | | its only consumer is qt_tool.prf, which is an internal api. Change-Id: Iae90b079c5af60efad2ded70d6ea481212e5353a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* add launch targets to qt appsOswald Buddenhagen2016-10-261-0/+1
| | | | | | | | this enables running non-installed prefix builds. Change-Id: I4169f276ff28506d0532cfe01a03e0fa102a25f8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* make use of silent error() emissionOswald Buddenhagen2016-08-081-1/+1
| | | | | | | | get rid of the entirely superfluous stock "Aborting." messages - the event triggering the exit has already reported the problem. Change-Id: Ib9dfb9e4212f60eceb2ea432cdf56c5a8afe9d65 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-181-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
| * ensure that we don't leak QT_TOOL_ENV beyond qt_tool.prfOswald Buddenhagen2015-12-161-0/+2
| | | | | | | | | | | | | | | | the variable is later re-used by qtPrepareTool(), so the tools used to build the tool would get excess variables passed. Change-Id: Ib1bdd2211b4a8615e2be9ba0310822f373f5efb0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | unbreak tool invocation in prefix builds againOswald Buddenhagen2015-11-061-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the statement order was wrong since c23a086e - we can't use MODULE_DEPENDS before we define it. but actually use a bigger cannon and partially revert the patch, to include .depends unconditionally again. the idea is that this should override a possibly included other .pri file from a previous build/install. (the same argument would sort of apply to .envvars as well, but we assume that its presence won't vary between builds.) Change-Id: I95e9743e367a3d1f45d603d1bb5b31c4875f39a2 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | configure: Separate host and build platform.David Schulz2015-10-301-22/+34
|/ | | | | | | | | | This separation makes it possible to make a canadian cross build of Qt on a linux build machine. The canadian cross build requires an external Qt that runs on the build system. Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* tools: use QStringBuilderMarc Mutz2015-10-151-0/+1
| | | | | | | | | | src/tools/bootstrap was already compiled with QT_USE_STRINGBUILDER, by way of load(qt_module), but the actual apps weren't. Some apps become smaller, some larger; all (presumably) faster. Change-Id: Idc8662e62ec14b27e730de9842bec295a1b5566e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix quoting and path separators in qtPrepareTool()Oswald Buddenhagen2014-05-231-1/+2
| | | | | | | | | | | | | | | we need to store commands with system path separators in the .pri files, as we might clobber windows command arguments if we just converted separators later on. and we can actually do that, as the path separators are actually bound to the host system, not the shell. we also need to shell-quote the commands, as whitespace, and more commonly windows path separators in an msys shell, would break things. we delay this to the last moment possible, as it does depend on the shell. Change-Id: I1fe6b63aebd5663b72492c32928ec397f86e336f Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* rewrite handling of private modulesOswald Buddenhagen2013-10-241-1/+1
| | | | | | | | | | | | | | | | instead of being magic attributes of the main modules, the privates are now proper modules of their own. this cleans up some code paths, is more mappable to other build tools, and enables private modules to depend on other private modules. note that the library path is needed even in the "empty" private modules, as in the framework case that's where headers are found. consequently, the modules need to be explicitly marked with the new "no_link" flag. this required some reorganization of qtAddModule(). Change-Id: I8e4f44a609f8d639cc01bcb658256870a627eb63 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* export QT_TOOL_ENV to the tool module pri fileOswald Buddenhagen2013-08-271-2/+21
| | | | | | | | fixes "make ts" in qttranslations in a non-installed prefix build. amends 13e01fda1 Change-Id: I2547d825c1c71e42fdacab5edaace67247ef69e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* assemble the tool commands at use time, after allOswald Buddenhagen2013-06-151-5/+6
| | | | | | | | | | | the precise syntax depends on what exactly the command is used for, so we need to resolve it at the last moment. see followup commits. This logically reverts commits 6f4ff81380862ad0e788151b35d742f548241d5a and 731e6bece5cebe205ca47c1c078c7ac18984ba1c. Change-Id: If285c91d7521069be86d32593b5c2ae2027b3038 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* split qt_app.prf out of qt_tool.prfOswald Buddenhagen2013-04-261-22/+1
| | | | | | | this way we can use it for "regular" apps (gui tools) as well. Change-Id: I3b00d0bde215dff1c2726b35626c4c0c256d92c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'gerrit/release' into stableSamuel Rødal2013-03-211-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
| * broaden the effect of CONFIG+=force_independent somewhatOswald Buddenhagen2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | modules which demand it (i.e., qtwebkit) need forwarding pris, etc., even when not making a -prefix build. Change-Id: Id405be8763e94cc074854f799bd785e9cdf62e8e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | don't bootstrap tools when not necessaryOswald Buddenhagen2013-03-141-4/+5
| | | | | | | | | | | | | | | | bootstrapping is only necessary if we are cross-compiling or have a circular build dependency. Change-Id: I17244457652ca9d4fc797043e57070c2ae3ee5d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | make QT setup for bootstrapped tools more cleverOswald Buddenhagen2013-03-121-1/+5
| | | | | | | | | | | | | | instead of simply overwriting it, intelligently re-interpret it. Change-Id: I5f7d8fff69ac8092653d7583da4c3884b9864b3a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add qt_common.prf and move some common definitions thereThiago Macieira2013-02-281-0/+1
|/ | | | | | | | This file is now included by three types of Qt output: modules, plugins (including QML plugins) and tools. Change-Id: I5085f6ff37f70e9228303bf0520040adc2e2d7a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* centralize detection of prefix buildsOswald Buddenhagen2013-01-311-1/+1
| | | | | | | this makes the use sites more expressive Change-Id: Ib879de65d1cc26462fa61f5339e951f294515faf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-171-1/+1
| | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* mark a bunch of features as internalOswald Buddenhagen2012-12-121-0/+11
| | | | | Change-Id: I5ad28827ff317985414e859263af85ceec31207c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* bootstrapped tools don't need env var setupOswald Buddenhagen2012-11-221-1/+1
| | | | | | Change-Id: I15d818d3ca24d426e492ea9d3a423f661b3ccf3b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't set CONFIG+=release during build passesOswald Buddenhagen2012-11-201-1/+1
| | | | | | | | | | otherwise we get inconsistent builds. Task-number: QTBUG-28046 Change-Id: I7952000bfc8e02ced5fd2c1bbffab7384f2730c1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make qt_tool support building bootstrapped toolsOswald Buddenhagen2012-11-161-3/+10
| | | | | | | | | | as a "side effect", this fixes the build of bootstrapped tools when doing a debug build under msvc: qt.prf would add CONFIG+=release after default_post.prf already loaded debug.prf. Change-Id: Idd17cf28d358950fd90bb18ca7a8d67e06953bc1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* let qt_tool.prf set up DESTDIROswald Buddenhagen2012-10-291-0/+3
| | | | | Change-Id: Ie30066566fe25859b2a661970b11a58e69361b1d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* namespace "module" pri filesOswald Buddenhagen2012-10-291-1/+1
| | | | | | | | we now have tool and soon plugin pri files. make them easily distinguishable. Change-Id: I8904e4182227a78060121e8712446bc43b1dd185 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* centralize module directory calculationOswald Buddenhagen2012-10-291-14/+1
| | | | | Change-Id: I5db529676b3287013008f28623a541fee1cde6a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* factor out qtAddTargetEnv()Oswald Buddenhagen2012-09-191-29/+1
| | | | | Change-Id: Ib0517da54da98de4b1f2ee7d80bee22316231091 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Build tools in release mode if using -debug-and-release optionYuchen Deng2012-09-181-4/+1
| | | | | Change-Id: I1d4b69e6954526b4f999e248f4f2cde6a9da26cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* factor out qtAddToolEnv()Oswald Buddenhagen2012-09-181-16/+1
| | | | | | | so it's available for other users as well Change-Id: I2d5a14ae427575c07321ac532b13ee03308b837f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* generalize environment additions to tool invocationOswald Buddenhagen2012-09-071-18/+30
| | | | | | | | | | | | | | | | | | | foo.name = VAR foo.value = baz bar foo.CONFIG = prepend QT_TOOL_ENV += foo will add the respective environment assignment to the generated command line. if value is a list, the elements are joined with the shell's path list separator. the value must be in the final form (correct path separators and shell-escaped). if .CONFIG prepend is set, the generated command will prepend the new value to a pre-existing one. Change-Id: I62c6dfb3ec50ce73d3a85a2099275f92b57a52dc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* cache the right variableOswald Buddenhagen2012-09-071-2/+1
| | | | | | | | binary+depends is outdated; it's just command now Change-Id: Ic4617d760585e53a485920e843627d3f9707d6a9 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* set QT_PLUGIN_PATH for toolsOswald Buddenhagen2012-08-151-2/+11
| | | | | | Change-Id: Ie76b25b605ab4271eff161ee9bfc4f54df640f4a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* build: Fix the FreeBSD build due build system change.Holger Hans Peter Freyther2012-08-141-1/+1
| | | | | | | | | Revision 6f4ff81380862ad0e788151b35d742f548241d5a broke the QtDeclarative build. FreeBSD's ld.so is using the LD_LIBRARY_PATH environment variable as well. Change-Id: I0a91cedfb9d1935a08d348212f5ff1a54bfe3e53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix -rpath-link handling for non-installed prefix buildsOswald Buddenhagen2012-08-111-0/+2
| | | | | | | | | forwarding module pris get rpath_link{,_private} fields, which are used accordingly by qtAddModule(). Change-Id: I0abc2dc8b1e8744dbf7f439aa7fed9ae159c2c74 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* assemble the complete tool commands already in qt_tool.prfOswald Buddenhagen2012-08-111-3/+23
| | | | | | | | this saves some repeated calculations. also, it's nicer to have most logic in one place. Change-Id: Iea362d40f5e6203709ced94d29ca61a4163b8e69 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove pointless checking/fallback code for $$TARGETOswald Buddenhagen2012-07-121-1/+0
| | | | | | | | | qmake always sets that variable, so unless somebody pro-actively screws it up (which doesn't seem like being worth checking for), it will just work. Change-Id: I3c4ada47cbd34ac68695d8efbf09c605392616f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* support building tools as application bundlesOswald Buddenhagen2012-07-111-2/+4
| | | | | | | qmlplugindump needs that Change-Id: I3b6b6689a32744262184fa781fda465460a87640 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* make non-bootstrapped non-installed prefix-built executables runnableOswald Buddenhagen2012-07-051-0/+55
tools like idc and lrelease are outside qtbase/bin and depend on libraries which are not in any search path, so we need some way to let the modules announce the locations (qt_tool.prf) and use it (in qtPrepareTool()). Change-Id: I98d5109cbee5e745d86dde94e3dc791d42edc3ec Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 12:50:28 +0000