aboutsummaryrefslogtreecommitdiffstats
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-17/+0
| | | | | | | | 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-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+19
| | | | | | | | | | | | | | | | | | | | | | | 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>
* Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-011-1/+1
| | | | | | Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-312-2/+2
| | | | | | | | | | | 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>
* Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-291-1/+1
| | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-0/+17
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Integrate QtQuickTest into QtCharles Yin2011-05-201-0/+17
| | | | | Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316 Task-number:QTBUG-16082
* Update module version number to 5.0.0Eckhart Koppen2011-05-131-3/+3
| | | | | Updated .pri file variables (cherry picked from commit a7fe708da19d6757322f871777ba16ace3721561)
* Merge branch 'master' into qtquick2Gunnar Sletta2011-05-041-5/+5
|\ | | | | | | | | Conflicts: src/imports/particles/particles.pro
| * Use private headersMarius Storm-Olsen2011-05-021-5/+5
| |
* | specify dependencies for declarativeGunnar Sletta2011-04-291-1/+1
|/
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-271-0/+1
|
* Added QT.<module>.imports support to module profiles.axis2011-04-271-0/+1
|
* Make each module refer to its own bin/Marius Storm-Olsen2011-04-271-0/+1
| | | | | | | Since modules cannot rely on QtCore having a build directory, nor can they build the applications directly into $$[QT_INSTALL_BINS] each module needs their own bin/. Add this path to each module's pri file, so others can use their applications
* Extended module profiles.axis2011-04-271-0/+3
| | | | Each module now sets the QT_CONFIG variable itself.
* Add the private_includes path to the modules .pri fileLiang Qi2011-04-271-0/+1
|
* Add the source path to the modules .pri fileMarius Storm-Olsen2011-04-271-0/+1
|
* Make declarative compile.Liang Qi2011-04-271-0/+9