aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/quick.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-241-1/+1
|\ | | | | | | Change-Id: I57e4b762dcccf2f7f6e4b659f6fc8c40465d3322
| * Use msvc qmake scope where appropriateOliver Wolff2018-11-221-1/+1
| | | | | | | | | | | | | | Use 'msvc' instead of 'win32-mscv*'. Change-Id: Ic592d9b5e63529aaae0b780b00e0fce5999926a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove left-over libqtaccessiblequick.so plugin referenceFrederik Gladhorn2018-11-191-1/+0
|/ | | | | | | This was forgotten in 079aaa9b0754db9b7b2a97cb2ea22042c6f50738. Change-Id: I12c2e5a0a6cb8ad0a4c6d27efe9a4acadb5840aa Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-01-261-0/+2
|\ | | | | | | Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
| * Quick: Remove last foreach, and mark QT_NO_FOREACHRobin Burchell2017-01-161-0/+2
| | | | | | | | | | | | | | | | Longer term, we should QT_NO_FOREACH .qmake.conf, but a number of other parts of the codebase still use foreach. Change-Id: I105cdbe2a64ae40ffa53d3aaa8765b09195af841 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2016-11-171-7/+4
|\| | | | | | | | | | | We no longer have any hope of getting this into 5.8. Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192
| * Make the designer support configurableLars Knoll2016-10-101-1/+2
| | | | | | | | | | | | Change-Id: I2c6cb57fbd6add3afe465dcc02c651ee9e96fbc7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Turn the no-network support into a configurable featureLars Knoll2016-10-101-6/+2
| | | | | | | | | | | | Change-Id: Ic70f60c124fe166b37fbe9b853735be3c5e0d46d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge branch remote-tracking branch '5.8' into wip/pointerhandlerShawn Rutledge2016-08-231-1/+1
|\| | | | | | | Change-Id: I1750ed28c5fda878a0a8f2b7bfe4c580c0b7ffe3
| * Adjust decarative after qtConfig changes in qtbaseLars Knoll2016-08-191-1/+1
| | | | | | | | | | | | | | | | | | Most of the changes are optional, but cleanup our QT_CONFIG usage. Change-Id: I5253d53f72f6fb03c2cfedae1e17d94f424a6bbb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Introduce QQuickPointerHandler: base class for nested event handlersShawn Rutledge2016-08-151-0/+1
|/ | | | | | | | | They will be Tech Preview in 5.8, so they shouldn't be available unless you explicitly import them. Task-number: QTBUG-54824 Change-Id: I290854a4e2b76e2cdfef5c216c7fdeb47fbcd390 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* Remove Windows CE.Friedemann Kleint2016-03-101-2/+2
| | | | | | | | Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses. Task-number: QTBUG-51673 Change-Id: I33ab74f0c2ce9086c3610c5fa727f281197b6b55 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* QtLite: no_network option for QtDeclarativePaolo Angelelli2016-03-041-1/+6
| | | | | | | | | | | | This patch adds the support for a no_network option for QtDeclarative, and the necessary #ifndef all around the code. no_network changes the interface of some classes, therefore using it breaks source compatibility. Change-Id: Iff612fb07041b8a7db99bd595bf038efaac2dd8a Reviewed-by: Risto Avila <risto.avila@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I5928f853a1d13b6a73533f9c6f6eae9da0e52a26 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Don't build designer for wincev5.6.0-rc1Andreas Holzammer2016-02-051-1/+1
| | | | | Change-Id: I3c122c0fe56b12a8e91c68ceff357600adcfc2bf Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Append scenegraph in MODULE_PLUGIN_TYPES of quick moduleAndy Nichols2014-09-021-1/+2
| | | | | | | | | While scenegraph is already a plugin type, it was not defined as plugin_type by the module feature file so qmake fails to build when using load(qt_plugin). Change-Id: I7a6cf21358bbda9878ebe78b7c208c0ded2cf4a9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Accessibility: Use factory function instead of pluginFrederik Gladhorn2014-03-271-0/+3
| | | | | | | | [ChangeLog][QtQuick] Accessibility for Qt Quick is now included in the qtquick library instead of being a separate plugin. Change-Id: I26a7ed14b8a387662cea8f89218485be50033e34 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Add an error signal to QQuickWindowLaszlo Agocs2014-02-211-0/+1
| | | | | | | | | | | | | | When nothing is connected to this signal, an error will be printed or, in case of Windows, a message box will be shown. If there is something connected, it is up to the application to handle the error. [ChangeLog] Added a new sceneGraphError() signal to QQuickWindow which applications can use to detect errors like OpenGL context creation failures and react in their own custom ways. Task-number: QTBUG-36138 Change-Id: I33b1e5e0e3f25872af67c5bb5ae937e3470b25f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Now android has only one platform plugin.BogDan Vatra2014-01-171-2/+0
| | | | | Change-Id: Idd3e0ede63be101a757a4f5f531693e3c7a24af6 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-12-191-1/+1
| | | | | Change-Id: I1f51b7d043f49f2f2849eb370ac71366cbaa6da5 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* remove obsolete workarounds for qmake processing order problemsOswald Buddenhagen2013-12-191-14/+0
| | | | | Change-Id: I4b58eee6243c92f67bdd9c8f9da36ef82a489c12 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Don't depend on widgets plugin in QtQuickEskil Abrahamsen Blomfeldt2013-09-171-2/+2
| | | | | | | | | | Since the accessible directory contains plugins for both the widgets and quick plugins, we need to specify the precise plugin, otherwise all QtQuick apps will depend on QtWidgets on Android. Change-Id: I8016afc64f8a75cc4ac0a3a69871df9cb2894f8a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into ↵Simon Hausmann2013-06-241-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wip/v4 Conflicts: src/imports/qtquick2/plugins.qmltypes src/qml/debugger/qv8debugservice.cpp src/qml/qml/qml.pri src/qml/qml/qqmlcompiler.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlcontext.cpp src/qml/qml/qqmldata_p.h src/qml/qml/qqmlengine_p.h src/qml/qml/qqmljavascriptexpression.cpp src/qml/qml/qqmlxmlhttprequest.cpp src/qml/qml/v4/qv4bindings.cpp src/qml/qml/v4/qv4irbuilder.cpp src/qml/qml/v4/qv4jsonobject_p.h src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/qml/qml/v8/qv8bindings.cpp src/qml/qml/v8/qv8contextwrapper.cpp src/qml/qml/v8/qv8listwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper_p.h src/qml/qml/v8/qv8sequencewrapper_p_p.h src/qml/qml/v8/qv8typewrapper.cpp src/qml/qml/v8/qv8valuetypewrapper.cpp src/qml/types/qqmldelegatemodel.cpp src/quick/items/context2d/qquickcanvasitem.cpp src/quick/items/context2d/qquickcontext2d.cpp sync.profile tests/auto/qml/qjsengine/tst_qjsengine.cpp tests/benchmarks/qml/animation/animation.pro tools/qmlprofiler/qmlprofiler.pro Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
| * Android: Make Qt5QuickParticles a dependency of Qt QuickEskil Abrahamsen Blomfeldt2013-05-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Since we don't have any way of parsing QML to find out which imports will be used, we need to always load Qt5QuickParticles library when using Qt Quick, since this is a dependency of the particles import itself. Otherwise, apps that use particles would crash. Task-number: QTBUG-30848 Change-Id: I24326e2d59fc05f7867233fe503b2708d50eee78 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Make sure correct files are bundled on AndroidEskil Abrahamsen Blomfeldt2013-05-041-0/+4
| | | | | | | | | | | | | | | | | | | | When we're bundling Qt inside the apk, we need to know which extra files to bundle which might be dependencies of the app. In this case, qml/ which contains the imports for Qt Quick 2, and the accessible/ plugins. Change-Id: I0782a6146a4d41d895db20d912eb6877e54ef6c8 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Fix build on WindowsSimon Hausmann2013-05-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include stdint.h for uint16_t and friends * Fix struct vs. class mismatch * Export QV4::String as referenced by QQuick * Eliminate declared but not defined destructor * Fix v4classgen python script to not require argsparse, so that it works with older Python versions * Replace the use of QStringLiteral in some places where we concatenate the input (like "Foo" \n "Bar") and MSVC thinks that the two string literals have a different "width" (8 bit vs. 16 bit) and therefore cannot be used with QStringLiteral * Add src/qquick to the include search path to work around the differing include search path semantics between MSVC and gcc Change-Id: Iedcc21cc757c53b6c7d81b514fd857ff1f573b01 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix compilation with built-in v4vm JS engineSimon Hausmann2013-04-151-1/+1
|/ | | | | Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Android support: build fixesPaul Olav Tvete2013-03-051-0/+3
| | | | | | Change-Id: If829341b0baef7b253a386a195d3b5e4238b8103 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-161-2/+0
| | | | | | | | qt is already added by spec_pre.prf, warn_on by default_pre.prf and dll by qt_module.prf. Change-Id: I449e49275622bac39b7d76af8855c417ddce21e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-121-3/+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>
* Merge branch 'buildsystem'Oswald Buddenhagen2012-06-261-4/+2
|\ | | | | | | Change-Id: I230e776290761be7c811c3aec4d915367012fc99
| * build system cleanupsOswald Buddenhagen2012-06-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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/+0
| | | | | | | | | | Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Doc: Use correct style and modules for doc build.Casper van Donderen2012-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | This change makes the "make docs" command use the correct style. Be aware that the "global" qdocconfs need to be in the QT_INSTALL_DOCS location before running "make docs", which effectively means that "make install" needs to be run in qtbase when doing a prefix build. Change-Id: Ib4635af0ad45717407a163968d629647898074dc Reviewed-by: Geir Vattekar <geir.vattekar@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>
* Extract Particles code to an independent libraryMatthew Vogt2012-04-161-1/+0
| | | | | | | | | QtQuick clients that do not use particles features should not have to load these classes. Task-number: QTBUG-25178 Change-Id: Ib15f7655dc4d821595e06f9160d2770375279027 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-6/+6
| | | | | | | | | | | | | 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>
* Say hello to QtQuick moduleKent Hansen2011-12-021-0/+47
This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 06:15:45 +0000