con
b1bcf081d8
Merge branch '2.1'
...
Conflicts:
src/plugins/coreplugin/basemode.cpp
src/plugins/coreplugin/basemode.h
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/projectexplorer/buildconfigdialog.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
src/plugins/qmldesigner/designercore/include/modelutilities.h
src/plugins/qmldesigner/designercore/include/nodeinstance.h
src/plugins/qmldesigner/designercore/include/propertymetainfo.h
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
src/plugins/qmldesigner/designercore/model/modelutilities.cpp
src/plugins/snippets/inputwidget.cpp
src/plugins/snippets/snippetscompletion.cpp
src/plugins/snippets/snippetscompletion.h
src/plugins/snippets/snippetspec.cpp
src/plugins/snippets/snippetsplugin.cpp
src/plugins/snippets/snippetswindow.cpp
src/plugins/snippets/snippetswindow.h
src/plugins/texteditor/snippetsparser.cpp
src/tools/qml/qmldom/main.cpp
tests/manual/trk/runner.cpp
tests/manual/trk/trkolddevice.cpp
tests/manual/trk/trkolddevice.h
tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
Alessandro Portale
606aba3659
Moved some functions to helpers.cpp
2010-11-15 22:15:48 +01:00
Alessandro Portale
e1aa293544
Qt Quick app wizard: Merge two .pri files into one
...
As an project tree unclutter measure, we now append the
deployment.pri to the qmlapplicationviewer.pri while generating
the stub for Qt Quick Apps.
At the same tame we keep te Qt Mobile App wizard intact, which
continues to generate the deployment.pri file.
And we also keep the qmlapp/app.pro template functioning as
project, therefore we leave the include(../shared/deployment.pri)
in qmlapp/app.pro and let the wizard remove that incude.
Task-Number: QTCREATORBUG-2568
Reviewed-By: ck
2010-10-04 10:54:25 +02:00
Alessandro Portale
977050d311
Remove incorrect (and unneeded) anchoring
2010-09-22 15:06:18 +02:00
Alessandro Portale
dd78f4e1c3
Remove incorrect (and unneeded) anchoring
2010-09-22 14:58:44 +02:00
Christian Kandeler
ee85384cc9
QML/Mobile wizard: Factor out common parts.
...
Reviewed-by: Alessandro Portale
2010-09-16 14:12:25 +02:00
Alessandro Portale
c3ceba4b80
Added test app and test scenarios for the new qml app wizard
2010-09-13 18:29:46 +02:00
