summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarative.h
Commit message (Collapse)AuthorAgeFilesLines
* Add a method that allows registration of files to typesAlan Alpert2012-12-051-0/+14
| | | | | | | | | | There is currently no way in C++ to duplicate the functionality of a qmldir file in mapping QML files to versioned types in a module. This functionality would be useful both in cases where a separate qmldir file would be overkill, and for cases where the type mapping should be generated dynamically. Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288eab Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Change the header message: this is now the QtDeclarative moduleThiago Macieira2012-10-191-1/+1
| | | | | Change-Id: I18a370a58494049939d035f1c3528406f3f7645f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-171-10/+10
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-241-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Define Q_QUICK1_EXPORT independentlyMatthew Vogt2012-02-271-5/+5
| | | | | | | | | | | | Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the qtquick1 module rather than using the definition in qtbase. This change undefines the definitions from qglobal.h; the undef should be removed once the definitions have been expunged from qtbase itself. Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix license header format.Matthew Vogt2012-02-071-2/+1
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-071-1/+2
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-311-5/+5
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-301-0/+415
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6