summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qml_module.prf
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-061-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qtestlib/tutorial5/containers.cpp examples/widgets/tools/tools.pro src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/network/kernel/qdnslookup_unix.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp tools/configure/configureapp.cpp Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
| * remove redundant OTHER_FILES assignmentsOswald Buddenhagen2016-05-021-3/+0
| | | | | | | | | | | | | | | | newer versions of qt creator understand QMAKE_EXTRA_COMPILERS and INSTALLS, so there is no need to list the files twice. Change-Id: Iccf3cc3248daf3422b8c366c2eb2d2f46c5f08d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-291-18/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qml_module.prf mkspecs/features/qt_common.prf src/gui/text/qzip.cpp src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/windows/array.h src/testlib/qtestcase.cpp src/widgets/dialogs/qfilesystemmodel.h Change-Id: Ie41c5868415b81f7693c80e045497035504bb210
| * make use of COPIESOswald Buddenhagen2016-04-271-17/+2
| | | | | | | | | | | | Change-Id: I34965cada901fce3cf300a99fa65d4d3f9bd4578 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Include the qml files into a resource when building a static pluginAndy Shaw2015-12-011-3/+17
|/ | | | | | | | | | | | Whenever a qml plugin is made static, the qmldir and other related files need to be compiled into the resources, so they can be found in the import path. By using qrc:/qt-project.org/imports, we can have this taken care of automatically for us via the build system, leaving us to just ensure that it is initialized in the code. Task-number: QTBUG-35754 Change-Id: Ifa7e2a66fd78dc6713dd7a8661ea2c155b174d35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* copy qml files only once in debug-and-release buildsOswald Buddenhagen2014-09-171-1/+1
| | | | | | | | the condition is copied 1:1 from the BUNDLE_DATA logic in qt_module.prf. Task-number: QTBUG-41267 Change-Id: Ia80a9a29319f70017e090855cf8d35a77b9e727f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* 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>
* 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>
* 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-2/+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>
* add qml1_{module,plugin}.prfOswald Buddenhagen2012-10-301-2/+7
| | | | | | | | | 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>
* preserve the directory structure of QML_FILESOswald Buddenhagen2012-08-081-1/+6
| | | | | | Change-Id: I39ccdbf59887f14be7dad492598160eebb94ce78 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* factor qml_module out of qml_pluginOswald Buddenhagen2012-08-071-0/+28
this makes it comfortable to create qml-only modules Change-Id: I17a5a3ee24210b93db05e50502c6ca91a4e7a9d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 03:02:10 +0000