summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qml_plugin.prf
Commit message (Collapse)AuthorAgeFilesLines
* make qml_plugin.prf usable without a parent c++ moduleOswald Buddenhagen2013-03-121-5/+14
| | | | | | | | | | | so far the assumption was that every qml plugin/module in qt is a wrapper/extension of a corresponding qt module. this not the case for the upcoming quickcontrols, for example. Task-number: QTBUG-28200 Change-Id: If4b8bb6633e76b2a510908d09a010cee12d33634 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove redundant codeOswald Buddenhagen2013-03-121-4/+0
| | | | | | | amends bb6b2f407 Change-Id: Ib56c502350bf46db352fb36d0ce46b6eb7c8ff58 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>
* fix path adjustments in installed metafilesMark Brand2013-01-301-0/+9
| | | | | | Task-number: QTBUG-28902 Change-Id: Ia70da8f0f0b7abb4ea2a46cb4068c0827888b322 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* Add a new location for QML 2.x importsThiago Macieira2012-11-191-4/+6
| | | | | | | | | | | | | | | | | | | 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>
* add qml1_{module,plugin}.prfOswald Buddenhagen2012-10-301-2/+12
| | | | | | | | | these are in fact thin wrappers around the qml2 variants, which got respective hooks. Change-Id: I1190856aea3f454b6f163e147d39c707a35ec4c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix 'qmltypes' targetsOswald Buddenhagen2012-10-261-1/+10
| | | | | | | | should now actually work for all build types Change-Id: I2dc1f8231737c13e95ce8aab1330b4f063951547 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make qmltypes target properly respect debug vs. releaseOswald Buddenhagen2012-10-261-7/+11
| | | | | | Change-Id: Ia4f5ccb2b795a7594b74ea95aa0cc56a91aa7043 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QML plugins: Make sure that both debug and release versions are builtKai Koehne2012-10-161-1/+9
| | | | | | | | Make sure that both debug and release versions of QML plugins are built if Qt is configured accordingly. Also pass on the other QT_CONFIG configurations. Change-Id: I4aaaf002068dd66277235bef7d1e3da3366d6d12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* factor qml_module out of qml_pluginOswald Buddenhagen2012-08-071-27/+4
| | | | | | | this makes it comfortable to create qml-only modules Change-Id: I17a5a3ee24210b93db05e50502c6ca91a4e7a9d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* use global imports install location as the "build" dir for qml plugin filesOswald Buddenhagen2012-08-071-2/+2
| | | | | | | | | when doing a non-prefix build (which is the only case where the code is executed), the build location is always the same anyway, so there is no use in complicating things. Change-Id: Id98755d818e05a11bed505abcb8b9d52a7d5b7c4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* copy qml files to build dir only when doing a non-prefix buildOswald Buddenhagen2012-08-071-8/+10
| | | | | | | | non-installed -prefix builds can't do anything useful with qml plugin files anyway, so don't waste time on copying them. Change-Id: I23f4b8f67402a85d3c6e741a04f88567655c1655 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move IMPORT_VERSION fallback into the conditional of the consumerOswald Buddenhagen2012-08-071-1/+2
| | | | | Change-Id: I01336903aaaff8bca5407aa3c50d330e8fd7910a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move qmltypes "compiler" below TARGET manipulationOswald Buddenhagen2012-08-071-17/+17
| | | | | | | | load(resolve_target) must not be called before we have a final target name. Change-Id: Ia7418672b0c7b7fbd388a63819af9ea9a54c5241 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix QT.<module>.*_VERSION referencesOswald Buddenhagen2012-07-111-1/+1
| | | | | Change-Id: I448de417d86f2500015b967581dbe7aab58e894a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* do not mess with VERSIONOswald Buddenhagen2012-07-111-2/+2
| | | | | | | | the import version is not supposed to determine the plugin version - it's only used by the qmltypes target. Change-Id: I0cb072cb0ee469bd96830262dbf4971a2bf3134f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* add feature file for centralized qml plugin project handlingOswald Buddenhagen2012-07-111-0/+67
Change-Id: I7cdce31d7ac458656cf8e8490fd7f7e5c04ca106 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 12:12:58 +0000