aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Allow multiple URL interceptors per engineUlf Hermann2020-03-1715-55/+91
| | | | | | | | | | | | | | | | | | | | | | We may want to have, for example, a QQmlFileSelector and a component-specific interceptor that chooses a theme or similar. Also, make the API public. We want to propose this as alternative to dynamically registering QML files via qmlRegisterType(QUrl, ...). Change-Id: I4a535d3ea556da6710fde816579ec188b3f57099 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Allow partial and absent version specifiers in import statementsUlf Hermann2020-03-1713-78/+153
| | | | | | | | | | | | | | | | | | | | An import statement without version specifier imports the latest version available, one with only a major version imports the latest minor version from that major version. Task-number: QTBUG-71278 Change-Id: I43907ae4e1052be533039d545de5391c41d38307 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | qsgrhisupport.cpp: Fix warningsFriedemann Kleint2020-03-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | scenegraph/qsgrhisupport.cpp: In member function ‘void QSGRhiSupport::applySettings()’: warning: ‘QSting::QString(const QByteArray&)’ is deprecated scenegraph/qsgrhisupport.cpp:161:102: note: in expansion of macro ‘qPrintable’ scenegraph/qsgrhisupport.cpp:585:112: warning: ‘void QAbstractSocket::error(QAbstractSocket::SocketError)’ is deprecated Change-Id: I848e089f9d6d26fcb7f44e9e83883f5f971eba3e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | CMake: Update Apple platform defines after rename in qtbaseTor Arne Vestbø2020-03-17175-343/+343
| | | | | | | | | | Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-03-171-2/+2
| | | | | | | | | | Change-Id: I02b8a408ef07aa48314195fe1fb396301003383c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-03-161-2/+2
| | | | | | | | | | Change-Id: Ia41e897ad59afc27ef4e3e454887414a818a7858 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Introduce new mechanism to manage palette functionality in QMLVitaly Fanaskov2020-03-1645-30/+2824
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main goals of these changes: 1) Add an ability to work with disabled and inactive palettes from QML 2) Eliminate massive code duplication in qtquickcontrols2 module 3) Provide easily extensible architecture for this piece of functionality Architectural part. Palette It was decided to not change existing QPalette, but add thin wrappers around it to provide all required functionality. These wrappers are highly coupled with QPalette class because of using some enum values from it. There are two new classes QQuickPalette and QQuickColorGroup. QQuickPalette class inherits QQuickColorGroup class and represents Active/All color group. QQuickPalette also provides an access to three color groups: Active, Inactive, and Disabled. In order to access colors the special class QQuickPaletteColorProvider is used. This is a wrapper around QPalette that provides some convenience functions. Interface The private property "palette" should be exposed. Implementation All private parts of classes that implement QQuickAbstractPaletteProvider have to inherit QQuickPaletteProviderPrivateBase class. This template class implement all functionality: create palette, resolve dependencies, connect objects etc. This is important to mention that related data is lazily allocatable on demand only. Hence, there is no memory overhead for regular items. Change-Id: I911424b730451b1ad47f68fd8007953b66eddb28 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | CMake: Add optional dependency on OpenGLWidgetsAlexandru Croitor2020-03-161-1/+1
| | | | | | | | | | | | | | | | Needed for some benchmarks. Change-Id: I795112bd795bd230fb4852e0aab466547bf56cb2 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: Fix painting benchmark dependency on OpenGLWidgetsAlexandru Croitor2020-03-164-3/+9
| | | | | | | | | | | | Change-Id: Ic7ed89c51e9a3cabda60ec99702b3aacd2cf5e97 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: Fix duplicate target name for qquickwindow benchmarkAlexandru Croitor2020-03-162-1/+29
| | | | | | | | | | | | Change-Id: I517d52e1ac35ae5d27d3e9ed676ebebdfe980db5 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: Fix QtQuick test import failure in testsAlexandru Croitor2020-03-162-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testlogger.js was added to the generated qmldir file with a 6.0 version, and that failed qmltests that tried to import QtQuick with the following error invalid version 6.0.0, expected <major>.<minor> import QtTest 1.1 ^ Until pro2cmake is fixed not to look at QML_FILES in .qmake .pro files when generating the contents of the qmldir file, add the js file to the static qmldir file and regenerate the project. Change-Id: I71d2dc34441f53f05c4eb3a108819913e809eb50 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: Fix version handling in qt6_qml_type_registrationAlexandru Croitor2020-03-161-4/+12
| | | | | | | | | | | | | | | | | | | | | | We passed full version strings like "6.0.0" and the old code passed "0.0" as the minor version, which is wrong. Split the string on the dot character, and extract the first and second parts to pass them along. Change-Id: I5faf89176dfd51d5048ed9234fd84b25c8b48bea Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: Enable cross-building Coin configurationsAlexandru Croitor2020-03-151-9/+8
| | | | | | | | | | | | | | | | This will enable iOS and Android CMake builds in Coin. Change-Id: Id2fea5b48de74185e19410ee5a61333c6f296d9e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | tst_qquickwindow::testWindowVisibilityOrder: remove unstable checkVitaly Fanaskov2020-03-131-9/+3
| | | | | | | | | | | | | | | | | | | | The problem here is that it's not possible to guarantee that a certain window has focus in this scenario. Furthermore, this test is not about focus at all. Task-number: QTBUG-62604 Change-Id: I941446d67b41571f59bcf10cbabfba1895bf2fca Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Update dependencies.yamlAlexandru Croitor2020-03-131-2/+2
| | | | | | | | | | | | | | | | To latest qtbase and qtsvg, to allow enabling of qtdeclarative CMake builds in Coin. Change-Id: I8d4382d3c54889500a59b017c876340848e615a5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Update dependencies.yaml to latest SHA1sEskil Abrahamsen Blomfeldt2020-03-134-2/+5
| | | | | | | | | | | | | | | | Required three updates to examples due to some changes in the dependency graph. Change-Id: I48dc9bf6d4fa82395bdf25deb1a768c354097bdc Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | QmlFolderListModelPlugin: unregister registered typeFabian Kosmale2020-03-131-1/+10
| | | | | | | | | | Change-Id: I29db8c652d85db5d9b92fd184632680a0ad06e55 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Remove QQmlFileSelector::setExtraSelectors overloadFabian Kosmale2020-03-132-13/+0
| | | | | | | | | | | | | | We only need the one taking a const reference. Change-Id: I9466e71495129bfccd5a70d93a6acbc43e25b2b4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QJSValue: Make call* const (Qt 6 TODO)Fabian Kosmale2020-03-132-6/+6
| | | | | | | | | | Change-Id: I3a6c83ffc203bf27121f460ba23d31a39d1493ee Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-03-12578-8/+25953
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ifff48b9d0e7962d481e63c49399e2d304e1011e5
| * | CMake: Regenerate and adapt to merge from devwip/cmakeAlexandru Croitor2020-03-1286-209/+546
| | | | | | | | | | | | | | | | | | Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
| * | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-12830-4578/+15524
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dependencies.yaml src/qml/qml/qqmlengine.cpp Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
| * | | Use correct default install dir for qml filesSamuli Piippo2020-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26b89d0e172465de3df36ffb0b2ea92975e99a2a Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Regenerate qtdeclarativeAlexandru Croitor2020-02-12253-1165/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48d7fd306f3d1b161a8e73029282ee591b1ef612 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update metatypes dependency calculationLeander Beernaert2020-02-103-147/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieve the list of dependent metatypes.json using the new source interfaces. Change-Id: I6ab57f370864031f2dbd097f14c3ebe6e7601d61 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Do not replace PATH when running qmltyperegistrarLeander Beernaert2020-02-071-2/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Id23574627470e1e53a71a28bbc72980aab74b54c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Fix tst_testfilteringLeander Beernaert2020-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4f9674f8226b0627cab6935a5c28bf52a57c2e9e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Add Qt6QmlBuildInternals.cmake and qt_add_qml_module()Leander Beernaert2020-02-062-0/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the qt_add_qml_module() which was originally present in QtBuild.cmake in QtBase. Change-Id: If053c0581dd14a6dcf4ef2013c9266e7dd828a76 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Fix plugins.qmltypes installation for non-prefix buildsLeander Beernaert2020-02-061-1/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I80c2b0cf29a5dcb4538aeea80222e2cc120fd979 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Fix qmlplugindump testLeander Beernaert2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I11a315cae0a89f17d42e8000cd4ef4a21296737e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Regenerate projects to handle private deps correctlyAlexandru Croitor2020-02-0547-185/+101
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcbab0407e93dfc35d0459d7d29dee2cd3508a86 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Copy qml files for non-prefix buildsLeander Beernaert2020-02-051-1/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Id912998aaec1807cca0ae2621d49a463ec17fe6d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Move OpenGL to optional componentSamuli Piippo2020-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parts of declarative is still buildable without OpenGL Change-Id: If76be1eaca03a4754d1d6a86c3d8fba3329bc773 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Always generate plugins.qmltypesLeander Beernaert2020-02-051-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the fact that there is no consistent usage of the qmltypes generation. We always have to add an entry to the qmldir file. Change-Id: Ic0638dfcc9a41378ec63bd5a10d90a523209cdbb Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Update add_custom_command and add_custom_target dependenciesLeander Beernaert2020-02-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't add the executable used by the custom_target and/or custom_command to list of the command's/target's dependencies (DEPENDS) the generated file will not update should the executable change. Change-Id: I5b33ab5aeea65daf0fb9f8802073b362d9c28742 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Fix plugin.qmltypes not being generatedLeander Beernaert2020-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ab5190ecef91c13aa4593f1e7db7f4fe21ca834 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | Fix qqmlmoduleplugin testLeander Beernaert2020-01-313-33/+69
| | | | | | | | | | | | | | | | | | | | Change-Id: I87354d4b8f8fc1acfe933640f5b48a4673a0dbd9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Update foreign types list generation to use ninja dep filesLeander Beernaert2020-01-312-17/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the generation of the foreign type list to use ninja dep files in order to only run if on of the calculated dependencies change. This patch also extends generation of the cpp file from qmltypesregistrar to use dep files so it runs if one of the dependent foreign metatypes.json is modified. Change-Id: I31c0dcf7cffea0c5277347f62115d9059244939a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Post-merge fixesAlexandru Croitor2020-01-3017-28/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: I2350df5368ee34d6c7072d456806e518ce533839 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-29342-1157/+4447
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
| * | | | Regenerate examplesAlexandru Croitor2020-01-2937-1/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I39564d4b644a7ee367d9ce92b85426a5c2a122a4 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Regenerate testsAlexandru Croitor2020-01-294-10/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b685745f0c7bf42904f7e8fca34ba14097f4686 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Regenerate plugins namesAlexandru Croitor2020-01-2913-40/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e1974f383974787bbfc95e06311c173fb06efdc Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Update qmltypes to use the new metatypes dependency formatLeander Beernaert2020-01-294-50/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The foreign types list for qmltypesregistrar is now generated by recursively processing the ${targets}_metatypes_dep.txt file. At build time we now use a custom script (Qt6QmlResolveDependencies.cmake) to generate the final foreign types file. qmltypesregistrar has also been updated in order to support the resolution of response files supplied to the command line arguments. Change-Id: Ib61d82fa92bf5d5a24631f461248f81147aad947 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | QML Type Registrar changesLeander Beernaert2020-01-2422-3/+104
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36254a688f575e6c7f717ee4019e4d49f73a60f7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Support for QML Types RegistrarLeander Beernaert2020-01-243-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff5da66ae179601fbfd369b9bc31005554df5873 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Post merge fixesLeander Beernaert2020-01-2448-212/+175
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2020-01-16830-35647/+106986
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
| * | | | | Regenerate TestsLeander Beernaert2020-01-168-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0eff9cb83b6e4c3cdbec4388969e4a194d1a88c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
| * | | | | Fix include paths of QmlDevTools[Private] for framework buildsJoerg Bornemann2020-01-071-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd0d1751f3532773e9258189d4a2e930a41b7625 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 02:41:06 +0000