feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,487 Commits 108 Branches 368 Tags
6a829f5a8fa272bfb4bef92cf40d6d024756be69
Commit Graph

26 Commits

Author SHA1 Message Date
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
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
Kai Koehne
d2ed221b1b QmlObserver: Add 'show app on top' switch to creator + qmlobserver 
This is convenient especially in the observer mode.

Reviewed-by: Christiaan Janssen
 2010-11-23 16:24:23 +01:00
Kai Koehne
a720abb733 QmlJSInspector: Code cleanup 2010-11-23 16:24:23 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
Kai Koehne
fdee97530e QmlInspector: Remove "Reload" button 
It only works together with qmlobserver. Making it disabled for .pro
file based projects would require some infrastructure.

Reviewed-by: Christiaan Janssen
 2010-10-08 15:51:56 +02:00
Kai Koehne
e81fa24807 QmlInspector: Rearrange icons in the QmlObserver toolbar 
Separate QmlObserver button + submodes from the general Preview &
Reload functionality.

Task-number: QTCREATORBUG-2163
Reviewed-by: Christiaan Janssen
 2010-10-08 15:51:56 +02:00
Lasse Holmstedt
fccd4d5e0c QML Inspector: Disabled rubberband selection tool 
It was not very useful without being able to e.g. move things around.
 2010-08-26 16:32:43 +02:00
Lasse Holmstedt
65e79d0d51 QML Observer & Inspector: Improved toolbars 
Animation play/pause buttons are now merged on observer toolbar. Also, a
bugfix to inspector toolbar.
 2010-08-25 09:39:33 +02:00
Lasse Holmstedt
290835300d QML Inspector: Renamed Design Mode to Observer Mode 2010-08-24 17:46:22 +02:00
Lasse Holmstedt
63da8d4cd7 QML Inspector: combined pause & play actions into one button 
Easier to use now by just clicking on one button, and takes less space.
 2010-08-24 17:46:22 +02:00
Lasse Holmstedt
b557c58eac Qml Debugger: Enable debugging qml+cpp standalone applications 
A new debugger engine, QmlCppEngine, is introduced, which wraps gdb
and qml engines into one. Alternatively, if using Windows, Cdb is used
instead of Gdb.

Most of the debugger ui switcher is now rewritten, and it is tailored
for the QML and CPP layout case, the only one supported anyway.

Reviewed-by: hjk
 2010-08-24 17:46:22 +02:00
Olivier Goffart
6ee61f2d1a Qml: always enable the reload button 
+ add missing tr()
 2010-08-18 10:44:32 +02:00
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor 
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
 2010-07-30 22:17:14 +02:00
Lasse Holmstedt
2c15b30a20 Qml JS Live Preview: Show warnings when running Live Preview 
Two kinds of warnings are now shown: one for warning about the Live
Preview itself, as it is experimental, and another when user changes
id's of objects during runtime, as this is not supported at the moment.

More warnings will be added later for other unsupported changes.
 2010-07-30 15:28:19 +02:00
Lasse Holmstedt
9d9fca6c7e disabled color box when debugger is not active 2010-07-27 11:58:39 +02:00
Lasse Holmstedt
fb681918c6 QmlJS Live Preview: Added color box to toolbar 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
c7a8d93765 QmlJS Live Preview: Implemented "Apply changes from Qml File" button 
The button is checkable and pressing it will stop/propagate changes to
the qml application being debugged.
 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
70f2243bde QmlJS Live Preview: Added title to anim speed context menu 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
a66b93d2f3 reset design mode when disconnected 2010-07-14 15:31:25 +02:00
Lasse Holmstedt
46b57ff723 added animation slowdown dropdown menu to toolbar 2010-07-14 15:30:53 +02:00
Lasse Holmstedt
2f8dc2833b added mode buttons to custom qml viewer and qmljsinspector toolbar 2010-07-14 15:30:52 +02:00
Lasse Holmstedt
ec1fc77afd added new icons for toolbar 2010-07-14 15:30:40 +02:00
Lasse Holmstedt
7e67880ef7 connected reloading signals 2010-07-08 12:30:08 +02:00
Lasse Holmstedt
9a81759101 manually applied changes from qmlinspector to qmljsinspector 2010-07-08 11:36:26 +02:00