Kai Koehne
ef1e52dfd1
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
...
Conflicts:
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/gdbmacros/dumper.py
share/qtcreator/gdbmacros/gdbmacros.py
src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/gdb/attachgdbadapter.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/watchhandler.cpp
src/plugins/mercurial/mercurialjobrunner.h
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qmljseditor/qmljseditor.pro
src/plugins/qmljseditor/qmljseditorplugin.cpp
src/plugins/qmljseditor/qmljseditorplugin.h
src/plugins/qmljseditor/qmljspreviewrunner.cpp
src/plugins/qmljseditor/qmljspreviewrunner.h
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
src/plugins/qt4projectmanager/qt4projectmanager.pro
src/plugins/qt4projectmanager/qtversionmanager.h
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
src/plugins/qt4projectmanager/wizards/targetsetuppage.h
2010-08-23 16:00:24 +02:00
Kai Koehne
420a2b4e6e
QmlEditor: Remove QtQuick->Preview from tools menu
...
This only works when a qmlviewer is in the PATH, which is non obvious.
Removing the feature therefore completely.
2010-08-19 17:15:40 +02:00
Thomas Hartmann
b193b3598f
QmlJSEditor: add shortcut for Qt Quick Helper (ctrl+alt+space)
...
This shortcut forces the Qt Quick Helper to be shown if
available. The action is also registered in the context menu
so it is discoverable.
Reviewed-by: Christian Kamm
2010-08-04 14:03:09 +02:00
dt
3ef43f56c7
Move qmltaskmanager from qmlproject plugin to qmljseditor
2010-07-14 13:01:43 +02:00
Lasse Holmstedt
21fbbc2c15
Added preview menu and shortcuts for qt quick (Ctrl+Alt+R)
...
This was needed since we cannot start stuff otherwise without a project
Task-number: BAUHAUS-450
Reviewed-by: kkoehne
2010-04-23 13:20:44 +02:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Roberto Raggi
967ed09c29
Initial support of `Follow symbol under cursor' for QML/JS.
2010-02-09 11:37:58 +01:00
Erik Verbruggen
062fa8e783
Added mime-type for JS files to the QMLJS text editor.
2010-01-15 17:41:39 +01:00
Erik Verbruggen
96e31c2a0f
Started merging the JS and QML editor plug-ins.
2010-01-15 17:20:19 +01:00
