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

52 Commits

Author SHA1 Message Date
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
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
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
801c8bb6d4 QmlJSDebugger: Code cleanup 
Fix indentation + line length.
 2010-12-01 16:54:32 +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
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
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
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
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
Alessandro Portale
7d622f1145 Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885 
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
  not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources

Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
 2010-11-01 17:03:46 +01:00
hjk
0afb34d5eb debugger: refactor breakpoint type, add function name to resolved jsbreakpoints 2010-10-29 14:31:16 +02:00
hjk
a3b24d233c debugger: pimpl JSDebuggerAgent 2010-10-27 18:44:25 +02:00
hjk
0593aa5bba jsdebugger: add a dummy entry to arrays that have no real children 2010-10-27 18:03:11 +02:00
hjk
f51301585e jsdebugger: use a real structure for a stack frame in the debuggeragent 2010-10-27 17:38:00 +02:00
hjk
f93fe86be7 jsdebugger: don't output function code. it's useless. 2010-10-27 17:38:00 +02:00
hjk
63ca71c2c7 jsdebugger: use QByteArray for data transfer 
Easier to debug, less data to transfer.
 2010-10-27 17:38:00 +02:00
Kai Koehne
87bb227605 QmlJSDebugger: Don't crash when using wheel & no items selected 
Task-number: QTCREATORBUG-2739
Reviewed-by: Lasse Holmstedt
 2010-10-14 14:45:43 +02:00
Kai Koehne
1839015452 QmlJSDebugger: Highlight items only if in Observer mode 
Task-number: QTCREATORBUG-2672
Reviewed-by: Lasse Holmstedt
 2010-10-14 14:45:43 +02:00
Kai Koehne
0a8c34d382 QmlApp: Only use QMLJSDEBUGGER define to activate qml debugging 
Don't confuse users by two defines they have to comment in when
they just want to 'debug': Instead QMLJSDEBUGGER now activates
both the Js Debugger & and the QmlObserver services. Finetuning
can still be done by using the (undocumented) NO_JSDEBUGGER,
NO_QMLOBSERVER defines.
 2010-10-13 16:52:58 +02:00
Kai Koehne
8162839827 QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver 
Make Observer and JSDebugger orthogonal.
 2010-10-13 16:52:58 +02:00
Kai Koehne
c6c2486d5d QmlJSDebugger: Fix linkage error 
Make sure that the private API used from Qt is compiled with
Q_DECL_IMPORT.

Task-number: QTCREATORBUG-2609
 2010-10-05 16:58:59 +02:00
Kai Koehne
c1954e09fc QmlJSDebugger: Fix path in standalone .pro file 2010-10-05 16:58:59 +02:00
Kai Koehne
8ad34357b8 QmlJSDebugger: Fix warning about JSAgent already connected 
We now instantiate an extra JSDebugger object in the generated class.

Reviewed-by: aportale
 2010-10-01 13:43:41 +02:00
Kai Koehne
6929d66ff2 QmlObserver: Prevent messages from being sent if there is no server side 
Actually this is fixed in QDeclarativeService::sendMessage, too, but the
fix won't be part of 4.7.1, so better double-check.

Reviewed-by: Christiaan Janssen
 2010-10-01 13:43:41 +02:00
Kai Koehne
eff5ceea64 QmlJsDebugger: Remove dependency to Qt private headers being installed 
Copy over the private header files to creator source tree, along the
lines of the what the designer plugin does.

Reviewed-by: Christiaan Janssen
 2010-10-01 13:43:40 +02:00
Kai Koehne
f343cc4bd4 QmlJSDebugger: Update API to changes in QDeclarativeEngine 
Reviewed-by: Christiaan Janssen
 2010-10-01 13:43:40 +02:00
Marco Bubke
45bdff449d QmlDesigner: Items in Positioner cannot manipulated anymore 
Add a positioner node instance and the concept of resizable and movable
items. Item in a positioner will be not selected anymore. Instead their
positioner will be selected which is not resizable.
 2010-09-29 13:54:27 +02:00