feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,662 Commits 108 Branches 368 Tags
af9a307c1574c307a25d9d2da3c5c3f1a496bac7
Commit Graph

83 Commits

Author SHA1 Message Date
Kai Koehne
af9a307c15 QmlJSDebug: Enable compilation of library also for Symbian 2011-04-29 15:08:43 +02:00
Kai Koehne
cc3aa73f5e QmlJSDebugger: Remove stale qmljsdebugger.pri file 2011-04-29 15:08:42 +02:00
Christiaan Janssen
85801227a9 QmlDebugger: keeping watches when changing stack frames 
Reviewed-by: Kai Koehne
 2011-04-20 17:33:26 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christiaan Janssen
76212f67b0 QmlDebugger: removed prefix in expression for locals 
Task-number: QTCREATORBUG-4462
Reviewed-by: Kai Koehne
 2011-04-11 17:27:56 +02:00
Thorbjørn Lindeijer
6161d0eb0c QmlJSDebugger: Disabled the Qt Quick tool box entirely for now 
This tool box doesn't add much value since the same actions are
available from Qt Creator and in the case of using the Observer, some
actions are also available from its menus.

Reviewed-by: Kai Koehne
 2011-03-23 17:37:58 +01:00
Thorbjørn Lindeijer
a8bf2ba5e3 QmlJSDebugger: Renamed "execution paused" to "animation paused" 
The latter better describes what is paused, since expressions are
actually still executed.

Suggested by Kai.
 2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
0a813cd67c QmlJSDebugger: Separated animation speed and paused state 
This separates animation speed and paused state in the communication
protocol between the Qt Creator QmlJSInspector plugin and the
QmlJSDebugger server.

Point is to allow changing the speed of the animation before resuming
execution. These two things were already separated in the QML Observer,
but not in Qt Creator.

Reviewed-by: Kai Koehne
 2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
1716d9bbb2 QmlJSDebugger: Define QMLJSDEBUGGER in qmljsdebugger-src.pri 
This pri file is meant for including the qmljsdebugger sources into an
Qt Quick application to make the qmljsdebugger easier to develop. It
makes sense to define QMLJSDEBUGGER since without that the QmlJS
debugger part isn't used.

See also 304b3c881c.

Reviewed-by: Kai Koehne
 2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
eab2518796 QmlJSDebugger: Fixed the enum toString methods 
Should use valueToKey since the key method works by index.
 2011-03-22 10:40:46 +01:00
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
ba92d4c922 QmlJSDebugger: Removed the double-click feature from the color box 
It was supposed to show a color dialog, but in practice it never worked
due to using show() rather than exec(). Removed it completely since it
was judged confusing and not very useful, since it is already possible
to copy the color by using the context menu.

Task-number: QTCREATORBUG-3878
Reviewed-by: Kai Koehne
 2011-03-17 15:43:10 +01:00
Thorbjørn Lindeijer
8defa8a7ac QmlJSDebugger: Use QWidget::window to get to the top-level 
Simplifies the code a bit.
 2011-03-17 15:43:10 +01:00
Thorbjørn Lindeijer
f5761c9212 Fixed crash when QML app shuts down itself in debugging mode 
The QDeclarativeViewObserverPrivate could end up referencing the tool bar
when it was already destroyed.

Reviewed-by: Kai Koehne
 2011-03-15 16:45:28 +01:00
Thorbjørn Lindeijer
ed23c77cba Don't show the QML debugging tool bar in the simulator 2011-03-15 13:31:28 +01:00
Thorbjørn Lindeijer
29777da964 Avoid use of dynamic_cast in qmljsdebugger library 
Remove usages of 'dynamic_cast' in qmljsdebugger library. Otherwise
compilation will fail for a Qt compiled with -no-rtti.

Task-number: QTCREATORBUG-4043
Reviewed-by: Kai Koehne
 2011-03-14 15:40:40 +01:00
Oswald Buddenhagen
7007326837 clean up DEPENDPATH insanity 
simply add
  CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
 2011-03-09 22:24:13 +01:00
Christiaan Janssen
ca3eedb8e5 QmlDebugger: hiding "this" from debugger when empty 
Reviewed-by: Kai Koehne
 2011-03-09 16:10:06 +01:00
Kai Koehne
315e18d79a QmlJsDebug: Fix regression in list of breakpoints 
Allow more than one breakpoint per compilation unit.
 2011-03-08 13:11:32 +01:00
Kai Koehne
304b3c881c QtQuickApp: Remove QMLJSDEBUGGER define from custom .pro file 
The qmljsdebugger-lib.pri is only included in 2.2 if the user explicitly
selected it in the Project Settings.

Reviewed-by: Christiaan Janssen
 2011-03-07 16:35:27 +01:00
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
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
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