summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_module_fwdpri.prf
Commit message (Collapse)AuthorAgeFilesLines
* qt_module_fwdpri.prf => qt_module_pris.prfOswald Buddenhagen2013-01-311-92/+0
| | | | | | | | | move the regular pri file creation into the "sub-prf" and rename it accordingly. the original reason for the split was the deep magic in activeqt (and phonon), which is gone now. Change-Id: If40e941afc9293725630ed6bcf3e4ef18a692f66 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge 'release' into stableOswald Buddenhagen2012-12-191-1/+0
|\ | | | | | | Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
| * stop defining QT.<module>.sourcesOswald Buddenhagen2012-12-141-1/+0
| | | | | | | | | | | | | | | | it's the very antithesis of modularization to do it. Task-number: QTBUG-27722 Change-Id: I2540e1a70e67b55420246d0c209314c05c65a85f 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>
* don't forget to export rpath_link{,_private} to the cacheOswald Buddenhagen2012-12-031-0/+1
| | | | | | Change-Id: I1d204696ed0e4ef5e45dc1716b3d6a8224b3169b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add a -libexecdir option to the configuresThiago Macieira2012-11-281-1/+2
| | | | | | | | | | | | | | | | | | User applications are those that users run directly, whether it be for development or not. The executable binaries that the user does not usually run but is still required for proper functioning are called "program executables" in Autoconf and they are placed in libexec. This commit adds support for "program executables" in Qt by adding the -libexecdir option to the configures, the qmake variable QT_INSTALL_LIBEXECS (note the plural, to match all other properties), and QLibraryInfo::LibraryExecutables. At the time of this commit, the only expected "program executable" is the QtWebProcess, the WebKit2 helper process from QtWebKit. Change-Id: I66c3a3e0cf7f9d93b5f88f55f18e957faff608fc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add a new location for QML 2.x importsThiago Macieira2012-11-191-1/+2
| | | | | | | | | | | | | | | | | | | This commits adds a -qmldir configuration option for the configures to allow the user to change the default location (it defaults to $archdatadir/qml). It adds a QLibraryInfo::Qml2ImportsPath value for QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf configure location entry "Qml2Imports". At the same time, it makes the qmake .prf files dealing with QML plugins be the QML 2 version. Those files are new in Qt 5, so we have the option to choose which version we want to use. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* define the module rpath in the installed module pri fileOswald Buddenhagen2012-11-131-3/+0
| | | | | | | | | | | the fallback path wouldn't account for a sysroot. as there is no clean way to implement that, rather remove the fallback alltogether and make the rpath a mandatory part of modules. Change-Id: I6f2bd6e36889be2f61e17a579174380aa3c6622d Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* kill $$mod_component_base & $$mod_qmake_baseOswald Buddenhagen2012-10-291-6/+6
| | | | | | | | | | use $$MODULE_BASE_OUTDIR & $$MODULE_QMAKE_OUTDIR directly. this is a no-op, except that now module pris will be built in qtbase for all modules when building without -prefix - which is only consistent with all other artifacts. Change-Id: I2965b2c7a15aa9e82ba6017f5f4c0daa14b6e6fe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* centralize module directory calculationOswald Buddenhagen2012-10-291-10/+1
| | | | | Change-Id: I5db529676b3287013008f28623a541fee1cde6a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* redo QT_PLUGIN_PATH assembly for non-installed executionOswald Buddenhagen2012-10-291-4/+0
| | | | | | | | | it is a bad idea to extract plugin paths from library modules. instead, just collect plugin paths from all known repositories. Change-Id: I527325f20e9cf98ae974997530af1b2893537e5d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Get rid of QT_MODULE_DOC_BASE/QT.foo.docsTor Arne Vestbø2012-10-161-2/+1
| | | | | | | | | It was only needed by qt_module.pri anyways, to handle index lookup paths for qdoc when building documentation that depends on other modules. Change-Id: Ibf60e2504f388b1aed7231eee04d89d3ba31c6eb Hand-held-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Ensure that Qt.module.docs is set when first creating the module-fwd fileTor Arne Vestbø2012-10-101-1/+1
| | | | | | | This is a follow-up fix to aef441b1. Change-Id: Ie5e92ecc55ddcbab3e7830a99a77d3748a5568c1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add QT.module.docs variable to the module systemTor Arne Vestbø2012-10-081-0/+1
| | | | | Change-Id: Ibe54ee44a06747453bc09e006e27187cbee30b23 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix rpath dir in forwarding module .pri fileRomain Pokrzywka2012-09-281-1/+1
| | | | | | | The module rpath should be the raw QT_INSTALL_LIBS, without the sysroot Change-Id: I4140929b38a589134872593e4ce35eaf7d1cd5b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* set QT_PLUGIN_PATH for toolsOswald Buddenhagen2012-08-151-1/+6
| | | | | | Change-Id: Ie76b25b605ab4271eff161ee9bfc4f54df640f4a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* support -rpath for modules which are not installed to QT_INSTALL_PREFIXOswald Buddenhagen2012-08-111-0/+3
| | | | | | | | | | | | | a module's project file may set MODULE_INSTALL_LIBS before loading qt_module.prf to have an alternative RPATH linked into the users of that module. this is relevant only for linking against non-installed -prefix builds of that module, as otherwise .libs from the module's pri file is used for rpath. Change-Id: Ib240e748cf130a71a5991dc643c368a983092ead Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix -rpath-link handling for non-installed prefix buildsOswald Buddenhagen2012-08-111-0/+43
| | | | | | | | | 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>
* put the include/ of all modules into qtbase when doing non-prefix buildOswald Buddenhagen2012-07-181-1/+1
| | | | | | | | | all other build artifacts go into qtbase's build directory anyway. this asymmetry was confusing and causes cmake users some grief. Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove support for forwarding module pri creation via syncqtOswald Buddenhagen2012-07-161-8/+0
| | | | | | | | | now that all modules have migrated, this dead code can be removed. Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* support for private depends in modulesOswald Buddenhagen2012-06-191-1/+1
| | | | | | | | | | | if a module's private headers add additional dependencies, QT_PRIVATE is now the place to declare them. note however, that this may not contain other private headers in turn - that would be much harder to implement, and we want the explicitness anyway. Change-Id: Ic516fcf1a003c95798df4fbe216f92016afaf47e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* generate fwd-pris in qt_module_config, not in syncqtOswald Buddenhagen2012-06-191-0/+52
the forwarding pri is loaded even if it was still created by syncqt, so a top-level qmake -r will still catch it even in the future. Change-Id: I2e4b556cd06eb88be9ee378662a2e6e1bff67ad7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 02:06:01 +0000