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

92 Commits

Author SHA1 Message Date
Kai Koehne
1cb3cdc744 QmlJSDebug: List QtScript as explicit dependency 
mingw/4.7.1 does not add QtScript otherwise to the list of files to link against.
 2011-03-02 14:45:21 +01:00
Kai Koehne
20189574f6 QmlJsDebugger: Handle breakpoints in qrc:// resources more gracefully 
Reviewed-by: Christiaan Janssen
 2011-03-02 14:45:20 +01:00
Kai Koehne
844c34513d QmlJSDebugger: Compare only file names for .js breakpoints 
The file names on device might be completely different, therefore
we cannot compare the absolute path.

Reviewed-by: Christiaan Janssen
 2011-03-02 14:45:20 +01:00
Christian Kamm
d80521aac1 qmldump: Add warning about code being shared with Qt. 2011-03-02 10:51:46 +01:00
Thorbjørn Lindeijer
d16e7a305e QmlJSDebugger: Only show the tool box when a debugging client connected 
Reviewed-by: Christiaan Janssen
 2011-02-28 17:20:31 +01:00
Thorbjørn Lindeijer
64c32469c8 QmlJSDebugger: Avoid warning in window flag logic 2011-02-28 17:20:31 +01:00
Thorbjørn Lindeijer
6355ed4734 QmlJSDebugger: Animation speed can always be changed 
The play button, that also allows changing animation speed, should never
be disabled since it works both in and outside of "observer" mode.

Reviewed-by: Kai Koehne
 2011-02-25 11:06:04 +01:00
Thorbjørn Lindeijer
ec92b3b2c0 QmlJSDebugger: Code cosmetics 2011-02-25 11:06:03 +01:00
Thorbjørn Lindeijer
603e7ade3f QmlJSDebugger: Switched message identifiers from string to enum 
Avoids spelling problems, makes it easier to know all possible messages
and enables autocompletion.

The enum is part of a QObject derived class so that the meta object can
be used to print out the enumerators as readable strings.

Reviewed-by: Kai Koehne
 2011-02-25 11:05:48 +01:00
Thorbjørn Lindeijer
6d6510139b QmlJSDebugger: Corrected some labels 
Reviewed-by: Kai Koehne
 2011-02-24 14:39:59 +01:00
Thorbjørn Lindeijer
eda6e85530 QmlJSDebugger: Fixed availability of resources of static library 
On some systems, apparently including Linux and Windows, it is necessary
to manually initialize resources when they are included in a static
library, with Q_INIT_RESOURCE.
 2011-02-24 13:40:56 +01:00
Kai Koehne
b7decc1356 QmlJSDebug: Fix compilation for debug builds on Windows 
Make sure we pick up the debugger version of qmljsdebugger library.
 2011-02-22 17:10:43 +01:00
Thorbjørn Lindeijer
e81e732452 QmlJSDebugger: Save and restore tool box geometry 
Convenient since you'll usually move the tool box next to the
application window.

Reviewed-by: Kai Koehne
 2011-02-22 16:38:20 +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
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