feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,741 Commits 108 Branches 368 Tags
1716d9bbb2982224105bfa994d1d083a868f1d69
Commit Graph

15 Commits

Author SHA1 Message Date
Thorbjørn Lindeijer
42b4e6c8f1 Observer: Fixed synchronization of animation speed and paused state 
The menus of the Observer were not being updated correctly when
animation speed was changed or when the animations were paused.

Now the whole thing looks a bit cleaner and the Observer menu
uses the QDeclarativeViewObserver to change these settings and stays in
sync when they change from other places.

Reviewed-by: Kai Koehne
 2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
ec92b3b2c0 QmlJSDebugger: Code cosmetics 2011-02-25 11:06:03 +01:00
Thorbjørn Lindeijer
1ed42339ea QmlJSDebugger: Don't create the tool box when compiling for a device 2011-02-22 16:38:20 +01:00
Thorbjørn Lindeijer
a5d3fcbc07 QmlJSDebugger: Code cosmetics 2011-02-22 16:38:19 +01:00
Kai Koehne
45187a15a7 QmlJSDebug: Avoid use of Q_PRIVATE_SLOTS macro 
Causes headaches because of a bug in qmake that sometimes still tries
to compile the _moc file individually, resulting in not defined errors.
 2011-02-18 12:57:34 +01:00
Thorbjørn Lindeijer
6e3ef903d0 QmlJSDebugger: Finished the renaming 
Some things forgotten as part of commit f9e65028fd since
these files are not compiled together with Qt Creator.

Fixes compile of QML Observer and QMLJSDEBUGGER-enabled QtQuick
Applications.
 2011-02-09 17:35:42 +01:00
Kai Koehne
47c9d2588a QmlJSDebugger: Beautify header 
Remove spurious semicolons
 2011-02-04 13:45:00 +01:00
Friedemann Kleint
e39386352a Header cleanup in share/qtcreator/qml, specify module name. 2011-01-24 12:30:21 +01:00
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
3bec12a4bf QmlJsDebugger: Avoid CURRENT_OBJECTS_CHANGED message flooding 2010-11-12 15:08:09 +01:00
Kai Koehne
8162839827 QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver 
Make Observer and JSDebugger orthogonal.
 2010-10-13 16:52:58 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools 
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
 2010-09-29 09:39:30 +02:00