Jarek Kobus
|
a6f12b3555
|
Replace qtquick 1.1's deployment with qrc file.
Don't generate Qt icons for Qt Quick App projects anymore.
Change-Id: Ic0fc43235a5b8da6696d5eb8d4a765d49b03dfd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
|
2014-03-20 19:59:46 +01:00 |
|
Jarek Kobus
|
848a725e3b
|
Use qrc files for qml files inside qtquick app templates
Remove unused application viewers
Task-number: QTCREATORBUG-11264
Change-Id: I3e24be9b58ef47cb2b2c2cce0361c08e71c93ee9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
2014-01-31 13:24:23 +01:00 |
|
Eike Ziller
|
851f255b9d
|
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
|
2014-01-15 14:04:41 +01:00 |
|
jkobus
|
d3b8da6cf8
|
Add qtquick 2.1, 2.2 and qtquickcontrols 1.1
Change-Id: If68e0c62781b235c2f0e573afe6d0e28709f28f3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
2013-12-05 10:04:31 +01:00 |
|