aboutsummaryrefslogtreecommitdiffstats
path: root/modules/qt_declarative.pri
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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