aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml.pro
Commit message (Collapse)AuthorAgeFilesLines
* Update docs after modularization of docsTor Arne Vestbø2012-10-121-2/+2
| | | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: I131408e27fec5b722ac1dece8e1ccf421fdaad67 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-111-3/+1
| | | | | Change-Id: Ia6bf273ff8ed63e13ea9f5c469b5f8e2702a4ee7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: I8a13b3aca195b9e8331478d73cd338ab66d65d1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove remnants of QQmlImageProviderKent Hansen2012-08-091-1/+0
| | | | | | | | QQmlImageProvider was renamed to QQuickImageProvider quite some time ago. Change-Id: I2f737f1e2a543c0abb0f45170499c41de25cf696 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Merge branch 'buildsystem'Oswald Buddenhagen2012-06-261-14/+4
|\ | | | | | | Change-Id: I230e776290761be7c811c3aec4d915367012fc99
| * build system cleanupsOswald Buddenhagen2012-06-261-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * auto-generate module prisOswald Buddenhagen2012-06-261-1/+1
| | | | | | | | | | Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Doc: Use the module "make docs" and rename qtquick "make docs".Casper van Donderen2012-06-251-0/+2
|/ | | | | | | | | The qtquick "make docs" is now renamed to "make qtquick_docs" and when you use "make docs" you get the automatic make command generated by qmake for modularized documentation. Change-Id: I23c0e52fa9c235f76df430f992201723ddcfbbea Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* put private Qt dependencies below load(qt_module_config)Oswald Buddenhagen2012-06-071-1/+4
| | | | | | | this will soon be needed to omit them from the master include header. Change-Id: I8f62a228a68fd53605eaf3f39f412a7b30c529b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove exceptions support from QtQmlChris Adams2012-05-251-1/+1
| | | | | | | | | | | | | | Previously, the sequence wrapper handled std::alloc exceptions. This commit removes that handling, as there are many other ways to use up all of the available address space memory which aren't handled (eg, loading lots of large images), and exception support causes a large overhead. See a1151929fffc765e128d72d170342020b34dd0b3 for more information. Change-Id: I68c9d7744e7dcece7b3112352e01ac71ead12f62 Reviewed-by: Glenn Watson <glenn.watson@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Explicitly enable exceptions for QtQmlLars Knoll2012-05-141-1/+1
| | | | | | | | | | | | QtQml uses a try/catch statement in one place to safeguard QList resizing. Since this can be called from the JS side, it needs to be safeguarded. Long term we should find a different way of handling this then using exceptions in one place. Change-Id: I51864d1b7ab468dd190c48e7a47c852ce35d40f1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Migrate gui dependencies from QtQml to QtQuick.Matthew Vogt2012-03-201-1/+1
| | | | | | | | | | | | | Ensure that users of declarative that have no need for functionality provided by the Qt Gui module do not have to link against it. Any use of QtGui functionality is delegated to providers that can be installed by another library; QtQuick adds default providers for this functionality when linked against QtQml. Task-number: QTBUG-24559 Change-Id: I5e6a58a4198732dc2f8f52f71abfa1152b871aa7 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-0/+37
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>