aboutsummaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Move workerscript to its own moduleUlf Hermann2019-05-061-0/+2
| | | | | Change-Id: I778cfe842ddf1c600a837d8f2061a338887eed95 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Move model types into their own libraryUlf Hermann2019-05-021-1/+3
| | | | | | | | | | The model types are not part of the core QML runtime and should only be loaded if you explicitly import them. We cannot enforce that in Qt5 as some of them are available from the QtQml import, but we can change it in Qt6. Change-Id: I1e49e84d748e352537ec2d4af901c034c91d038f Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
* no-thread: build fix for when networking is enabledv5.12.0-beta1Lorn Potter2018-10-011-1/+1
| | | | | Change-Id: I5e9601d056d43fe4ba1ecf874a68c1986110e447 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Enable Qt Quick path and shapes for the no-thread configurationMorten Johan Sørvig2018-09-121-3/+1
| | | | | | | | | | | | Force synchronous rendering in QQuickShapGenericRenderer. (In theory, we could support async also for no-thread by running the tasks on the Gui thread, but there would perhaps be little gain from doing this.) Change-Id: I0fb7526fdaa56d3c609c83c8d4790b4352d782fd Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Make QtDeclarative work for the no-thread configMorten Johan Sørvig2018-09-051-1/+3
| | | | | | | | | | | | | Force use of the basic render loop, adapt qqmlthread and qqmltypeloader to work on a single thread. Disable components and features that require worker threads: qmldb_server, worker script, shapes, folderlistmodel, threaded render loop, software renderer. Done-with: Lorn Potter <lorn.potter@gmail.com> Change-Id: I77d965947f684f8b7d19284b5decd893395316cb Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Qt Quick depends on gui moduleSamuli Piippo2018-07-301-1/+1
| | | | | | | | Don't build anything from Qt Quick without gui module. Change-Id: I5cf23dde8fa2c121e824435748260e46e3ef38bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Move QtQuick.Shapes implementation to qtquickshapes, privately exportedPaolo Angelelli2018-06-211-1/+4
| | | | | | | | | | | This change moves the implementation of QtQuick.Shapes into an own qt module, where classes are privately exported. In this way Shapes QML types can be internally (= from other Qt modules) instantiated also from cpp. Change-Id: I428f981f0a1f3083e6571cbeaffa706fd8ef7254 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* qtlite: Fix build with -no-feature-testlibMikhail Svetkin2018-04-121-2/+4
| | | | | Change-Id: I45ffc2f5ef6147b0c2997fca3961bf3aec21bbfc Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-221-0/+2
|\ | | | | | | Change-Id: I8cca650fbb1904ecba59da909a08dba3cc574add
| * Move the QML_COMPILE_HASH macro definition from the command-lineThiago Macieira2018-02-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | If it's in the command-line, it is added to the precompiled header, which won't be regenerated if the macro changed. Instead, let's create a header that can be #included only in the file it needs to. Since qmldevtools compiles the file that has this new #include, we need to ensure it was created before the module is compiled. Change-Id: I940917d6763842499b18fffd1513b9c64cd98387 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add a feature for qml-animationUlf Hermann2018-02-151-1/+1
| | | | | | | | | | | | | | | | | | It should be possible to switch it off without globally switching animations off in Qt. Change-Id: I3cae6b72b2c6b5c420f21625208de5e273839438 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Add a feature for qmldevtoolsUlf Hermann2018-02-091-3/+4
|/ | | | | | | Change-Id: I45cc33c7d5efec6604152a94f26ee83df940d9e7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix build without networkUlf Hermann2018-01-081-2/+5
| | | | | | | | The "qml-network" feature depends on the general "network" feature and we shouldn't query network-specific features if it's not set. Change-Id: Id7d39f839a35c121565096151c5df3ab4da76632 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Make qml-debug a proper featureUlf Hermann2017-11-081-2/+3
| | | | | Change-Id: Iea33ff0200f0bbf43953fedba030edf91d0f1417 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add features.quick-particlesPaul Olav Tvete2017-03-131-1/+1
| | | | | Change-Id: I78b30d254ed64acadcb2acc278ad1dfde55216ac Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Build fix for -no-feature-quick-shadereffectPaul Olav Tvete2017-03-101-1/+1
| | | | | Change-Id: Ie1f601c6ae4c6c5d8d23b14a6670979d9c24e209 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix build without animation by disabling quickTasuku Suzuki2017-01-301-1/+1
| | | | | | Change-Id: I3b9bc6aa69dbf2a780765ba935b76be6a22280e6 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
* remove obsolete host build declarations from subdirs projectsOswald Buddenhagen2017-01-261-2/+0
| | | | | | | follows up qtbase/4eb2feb2. Change-Id: I13ba74fb25dfd059782b369350fa14e44b70bf79 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix build without features.localserverTasuku Suzuki2017-01-231-2/+2
| | | | | Change-Id: I25edd84fb67f417caa98e63f284547eac3a7793a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Make Sprite a configurable featureLars Knoll2016-10-101-1/+4
| | | | | | Change-Id: Iab5c5261cb3cdce3d02fa6cd19ae6f594b6fc649 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Qt Quick depends on guiSamuli Piippo2016-09-191-6/+8
| | | | | Change-Id: Iaed15ebbf669dadb692aec0f8db13a7e0b2e5fcc Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Adjust decarative after qtConfig changes in qtbaseLars Knoll2016-08-191-2/+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>
* Enable QQuickWidget for no-OpenGL buildsAllan Sandfeld Jensen2016-06-241-1/+2
| | | | | | | Enables and fixes QQuickWidget so it compiles in no-opengl builds. Change-Id: Ib50dec1d1429ec1140257dd6dcd9784126e61852 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Doc: Add Basic documentation for Scenegraph AdaptationsAndy Nichols2016-05-091-1/+0
| | | | | | | | | | | Now that there are multiple scenegraph adaptations, there needs to be a bit more documentation describing each. Really the only fully supported additional backend is the Software adaptation, so the relevant docs have been transferred from the 2D Renderer documentation, and the old docs are now removed. Change-Id: I951f87357a03a37bacb14185748b67ac9ae9a9cf Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Enable building Qt Quick module with QT_NO_OPENGL definedAndy Nichols2016-03-221-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | Currently the Qt Quick module depends on either the OpenGL or OpenGLES headers being available at build time. Since we are adding support for adaptations that do not depend on OpenGL, it should be possible to build Qt Quick in environments that do not have OpenGL development headers. This does present many challenges though because in some cases GL types, and classes that require OpenGL are part of the public APIs. However since these classes were never available when QT_NO_OPENGL was defined, it should be possible to redefine the function signatures under this scenario, since it's not possible to break binary compatibility if there never were any binaries to break compatibility with. One of the bigger changes that was necessary to facilitate this change is creating interfaces out of QSGContext and QSGRenderContext. Here the default behavior was usage of OpenGL directly, even though subclasses could override all OpenGL usage. Making them interfaces should bring QSGContext and QSGRenderContext more in line with the other classes present in the adaptation layer. Change-Id: Iaa54dc0f6cfd18d2da1d059548abf509bd71f200 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Merge remote-tracking branch 'qtdeclarative-2drender/dev' into qtdeclarativeAndy Nichols2016-03-081-0/+1
|\ | | | | | | | | | | This integrates the Qt Quick 2D Renderer into the qtdeclarative module Change-Id: I3080b3ca0194794e2145b240526f5a693418543b
| * Doc: Add some basic documentationAndy Nichols2014-11-181-1/+3
| | | | | | | | | | Change-Id: Id6f986bc5d46912355f42e6ae8d72fe2738c2c19 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Reformat project to be a Qt ModuleAndy Nichols2014-09-021-0/+2
| | | | | Change-Id: I2fe8df530a687247a9cd7ea12c1d8de79fef506e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Revert "Build (and fail) Quick with -no-opengl"Laszlo Agocs2016-02-121-9/+5
| | | | | | | | | This reverts commit 707e6f528fc79db236d282e7ea41eb952c825433. We will not pursue this route for the time being. Change-Id: Idd1fce362440f6bf1b58901a289843fdfb39a5b7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Build (and fail) Quick with -no-openglLaszlo Agocs2016-02-051-5/+9
| | | | | | | | | | | | | Disable qmltest, particles, Quick examples and tests. Also guard private QOpenGL header includes because, unlike the public QOpenGL* headers, this is not done in the private headers. This allows build attempts against a -no-opengl qtbase. It will of course fail when encontering the GL symbols and QOpenGL class usage in Quick/SG. Change-Id: I323f7a8b8854cc6e486e264517df30be3e5f8d3c Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Don't build qmldebug or qmlprofiler on -no-qml-debugUlf Hermann2016-01-221-1/+2
| | | | | | | | qmlprofiler depends on qmldebug and won't work with that version of Qt anyway. Change-Id: I86a180671b8d7c84e9ab05ff1cef4e6a5ea4f7f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Move QQmlDebugClient into separate static libraryUlf Hermann2015-10-301-0/+1
| | | | | Change-Id: Ib3daf9da2cf6798bd022cfcf54d11e565c9cb4ca Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* nest quickwidgets into the opengl conditionalOswald Buddenhagen2014-05-071-2/+2
| | | | | | | | the qtHaveModule(quick) could have of course not worked at this point. Task-number: QTBUG-38202 Change-Id: Id0270d445b9b82731209d69a9dc1950c03c26781 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add dependency check for quickwidgetsZhang Xingtao2014-04-291-1/+1
| | | | | | | | | | If not, there will be an error when building with -no-opengl option: "Project ERROR: Unknown module(s) in QT: quick-private" The quickwidgets module depends on qt quick module, and qt quick module depends on opengl. Change-Id: If74b5582bdd96ed19ec10dbc534d02146717bc08 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Introducing QQuickWidgetLars Knoll2014-02-171-0/+2
| | | | | | | | | | | Renders into an FBO, and provides a texture that is composed by the QPA/widget kernel compositor. Also introducing QQuickRenderControl, which is private API for now. Change-Id: I710c16e1506124a17f91e87344496471803a448b Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Explicitly mark subdirs as host_builds in SUBDIRS templateTor Arne Vestbø2013-10-251-0/+2
| | | | | | | | | | | Allows post-processing code to exclude recursing into host_build subdirs. The alternative would be to have the SUBDIRS logic pre-parse the subdir project to check if it's a host_build, but that might have a performance impact, so it's better to leave the information explicit in the subdir project file. Change-Id: I468ceeaedce54b13bf672f82b9dcf04cc19d15e1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fixed build when Qt is configured with -no-opengl.Samuel Rødal2013-02-201-1/+1
| | | | | | Task-number: QTBUG-28849 Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-101-1/+1
| | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make module compile with -no-guiTasuku Suzuki2012-11-221-4/+10
| | | | | Change-Id: I106cf0933930115464b0b7507177e6129098d22b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pointless qmltest conditionalsOswald Buddenhagen2012-06-261-6/+8
| | | | | | | | it is a module within this repository, and consequently the flag is always set. Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove QtDeclarative compatibility moduleKent Hansen2012-05-141-2/+0
| | | | | | | | | | | | | | | When the QtDeclarative module was renamed to QtQml, a compatibility module was introduced to avoid disrupting downstream projects. Time has passed, and it's now appropriate to remove this module. Existing projects that haven't ported can still use the bin/rename-qtdeclarative-symbols.sh script to ease the porting. Change-Id: I05a9727013d9e38c2262577f68260a4382bfbeea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Extract Particles code to an independent libraryMatthew Vogt2012-04-161-1/+1
| | | | | | | | | 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>
* Create a forwarding declarative module.Matthew Vogt2012-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | The declarative module has been replaced by the qml module. To allow existing projects which depend on the old declarative module to build, add a new declarative module which forwards dependencies on to the new qml module. This module contains only redefinitions of old symbol names to their new replacements, and creates forwarding headers that include the replacement headers provided by the qml module. This is a temporary change to prevent breaking existing projects that depend on the declarative module. After clients have had an opportunity to update their code to the use the new interfaces, it can be removed. Task-number: QTBUG-23737 Change-Id: I3cec5ceec4f9725c258e3672360a05ea87d3ca2f Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-1/+1
| | | | | | | | | | | | | 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>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-1/+1
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Say hello to QtQmlDevTools libraryKent Hansen2011-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | QtQmlDevTools is a private helper library. It provides QML/JS file parsing for tools that live outside of the qtdeclarative repository, such as lupdate. This allows us to remove qttools's dependency on the qtdeclarative sources. To use the library: QT += qmldevtools-private #include <private/qdeclarativejsparser_p.h> Change-Id: Ia43751b9be3d9fe05da03e65c6aca1cd9e3fdbbc Reviewed-on: http://codereview.qt-project.org/6116 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Re-enable QtQuickTest.Rohan McGovern2011-09-191-2/+1
| | | | | | | | | | This was disabled in refactor, but it seems to be working OK, so turn it back on. Change-Id: I35d97342c6ef7be358d9cb593a1eab27c711247c Reviewed-on: http://codereview.qt-project.org/4846 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-311-1/+1
| | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Make QSGCanvas a QWindow instead of a QGLWidgetGunnar Sletta2011-08-051-1/+4
| | | | | | Change-Id: I71a04f61acff893a35c00204ed11bdf852830485 Reviewed-on: http://codereview.qt.nokia.com/2675 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 16:08:44 +0000