feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

728 Commits

Author SHA1 Message Date
Thorbjørn Lindeijer
a5d3fcbc07 QmlJSDebugger: Code cosmetics 2011-02-22 16:38:19 +01:00
Thorbjørn Lindeijer
b23c24d275 QmlJSDebugger: Show the tool bar of the declarative view observer 
Now in a tool window so that it generally doesn't interfere with the
application.
 2011-02-22 16:38:19 +01:00
Kai Koehne
6507f5ff83 QmlObserver: Allow to compile it again in source 
Make it possible (again) to compile qmlobserver in share/qtcreator.
However, build artifacts in there might result in a malfunctioning
qtc-qmlobserver!

Reviewed-by: Thorbjorn Lindeijer
 2011-02-21 16:40:53 +01:00
Kai Koehne
fbca39aefd QmlJsDebug: Fix compilation on Linux, Mac 
Use camel case for library name all over the place.
 2011-02-21 11:44:34 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library 
Reviewed-by: dt
 2011-02-18 12:57:45 +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
Kai Koehne
5dc9a0cb43 QmlDump: Add copyright header 2011-02-18 11:50:27 +01:00
Christian Kamm
13f9135827 qmldump: Dump attached types and read them in Creator. 2011-02-10 17:04:22 +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
Thorbjørn Lindeijer
f9e65028fd QmlJSDebugger: Prefix live editor related classes 
AbstractFormEditorTool -> AbstractLiveEditTool
LayerItem -> LiveLayerItem
SelectionIndicator -> LiveSelectionIndicator
SelectionRectangle -> LiveSelectionRectangle
SelectionTool -> LiveSelectionTool
SingleSelectionManipulator -> LiveSingleSelectionManipulator
RubberBandSelectionManipulator -> LiveRubberBandSelectionManipulator
 2011-02-09 17:14:27 +01:00
Christian Kamm
fd7a115d1c qmldump: Ignore exports that are missing the type name. 2011-02-09 13:40:09 +01:00
Christian Kamm
2ec429e8ce QmlJS: Switch to new format for QML meta data. 2011-02-09 10:42:49 +01:00
Christian Kamm
bffe90b2f4 qmldump: Clean up code and make it output qml data. 
Task-number: QTCREATORBUG-3048
 2011-02-09 10:42:48 +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
Christian Kamm
315fc34f3b qmldump: Produce an error message if module import fails. 
Reviewed-by: Kai Koehne
 2011-01-21 10:28:19 +01:00
Marco Bubke
8512f1ed4a QmlDesigner: Don't show the dock icon for the puppet anymore 2011-01-13 18:05:34 +01:00
Kai Koehne
b0184e9187 QmlObserver: Fix compilation when no private headers are installed 
Regression introduced in 17d11b7be3.
 2011-01-13 10:45:00 +01:00
Christian Kamm
033a0ff12e qmldump: Add example to clear up intended usage. 
Reviewed-by: Kai Koehne
 2011-01-12 14:03:01 +01:00
Christian Kamm
18f9031ba6 qmldump: Add signal handler to catch segvs. 
Reviewed-by: aep
 2011-01-12 13:16:07 +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
17d11b7be3 Update qmlobserver with latest qmlviewer patches 
Update qmlobserver with changes in qmlviewer until 376e636eccedb8d8bb.
 2010-12-10 13:25:26 +01:00
Kai Koehne
801c8bb6d4 QmlJSDebugger: Code cleanup 
Fix indentation + line length.
 2010-12-01 16:54:32 +01:00
con
7c0b1b63d5 Merge remote branch 'origin/2.1' into master 2010-11-30 16:45:15 +01:00
Christian Kamm
3fbc0bd31d QmlDump: Fix use with namespaced types. 
Reviewed-by: Roberto Raggi
 2010-11-30 13:42:00 +01:00
Christian Kamm
e732b3c102 QmlDump: Allow building and using with Simulator Qt >= 4.7.1. 
Reviewed-by: owolff
Reviewed-by: Kai Koehne
 2010-11-26 11:18:26 +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
e0811beef3 QmlJsDebugger: Code cleanup 2010-11-23 16:24:23 +01:00
Kai Koehne
302a07b05b QmlJSDebugger: Fix indentation in .pri file 2010-11-23 16:24:22 +01:00
Kai Koehne
ff7abee83b QmlJsDebugger: Remove QWEAKPOINTER_ENABLE_ARROW define 
Any DEFINE used in qmljsdebugger-lib.pri is also passed to the users
code.
 2010-11-23 16:24:22 +01:00
Kai Koehne
28adb0a178 QmlJSDebugger: Remove editor.pri 
Incorporate into qmljsdebugger-lib.pri

Task-number: QTCREATORBUG-2951
 2010-11-23 16:24:22 +01:00
Kai Koehne
8b59a52bc1 Revert "make compile against 4.7 mainline" 
This reverts commit 110c58d09e,
and enables qmljs debugging again.
 2010-11-19 15:52:11 +01:00
dt
c9c5fe1542 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/qmljseditor/qmljshoverhandler.cpp
	src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
 2010-11-18 19:28:23 +01:00
Kai Koehne
2b8e5b5333 QmlObserver: Fix navigation on Mac OS X 
The QmlObserver relies on installing an event handler on the graphicsview
viewport, to get e.g. Mouse events.

QmlObserver on Mac OS X switches the viewport later on to a QGLViewPort, when
QmlObserver has already been set up ... Make QmlObserver aware of this by
listening to the ChildRemoved event that will be signalled in this case.

Task-number: QTCREATORBUG-2892
Reviewed-by: Lasse Holmstedt
 2010-11-16 11:01:01 +01:00
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1' 
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
 2010-11-15 19:03:18 +01:00
Kai Koehne
d16c75fe00 QmlJSDebugger: Simplify selection handling code 
Avoids multiple calls singleSelectionManipulator.select().
 2010-11-12 15:08:09 +01:00
Kai Koehne
3bec12a4bf QmlJsDebugger: Avoid CURRENT_OBJECTS_CHANGED message flooding 2010-11-12 15:08:09 +01:00
Kai Koehne
4201046b9b QmlObserver: Remove breadcrumb widget in observer mode 
I wasn't able to get it working on Mac OS X: Putting it on top
of the QGraphicsView doesn't work because Cocoa doesn't allow a
widget to be on top of OpenGL viewport. Embedding it as a
QGraphicsProxyWidget produces lots of Cocoa warnings (raster engine related).

Anyhow, the same widget shows up in the Debugger/Observer tab of
Qt Creator.

Reviewed-by: Lasse Holmstedt
 2010-11-11 12:51:15 +01:00
Thomas Hartmann
f7e7de44cb QmlJS: Dump isWritable and isPointer for types. 
Reviewed-by: Christian Kamm
 2010-11-11 11:49:11 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
Kai Koehne
3d758f12c4 QmlObserver: Fix compilation if no private headers are installed 
Use the copy of the qdeclarativedebughelper_p.h that we have in
qtcreator instead.

Reviewed-by: Christiaan Janssen
 2010-11-09 12:40:06 +01:00
Bill King
110c58d09e make compile against 4.7 mainline 2010-11-09 14:53:21 +10:00
Kai Koehne
bb27ed24bf Revert "QmlJsDebugger: Fix observer navigation on Mac OS X" 
This reverts accidentally pushed commit 4f33fbc229.
 2010-11-05 16:21:00 +01:00
Kai Koehne
4f33fbc229 QmlJsDebugger: Fix observer navigation on Mac OS X 
Seems that mouse events aren't sent through the viewport on Mac OS X.
 2010-11-05 16:15:53 +01:00
Oswald Buddenhagen
dd45277a19 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
 2010-11-04 19:18:45 +01:00
Kai Koehne
26f79571e6 QmlObserver: Use new 4.7.1 API to enable qml debugging 
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

Reviewed-by: Alessandro Portale
 2010-11-03 14:07:16 +01:00
Kai Koehne
2ac91abd30 QmlApp template: Use new 4.7.1 API to enable qml debugging 
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

The patch introduces a static create method to QmlApplicationViewer,
so that the setup can be hidden from the users main file.

Reviewed-by: Alessandro Portale
 2010-11-03 14:06:44 +01:00
con
dbb1c5ef77 Merge remote branch 'origin/2.1' 2010-11-02 11:14:03 +01:00