feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,510 Commits 108 Branches 368 Tags
aea3297932dccdfba66b92497c91cc0b1998017a
Commit Graph

64 Commits

Author SHA1 Message Date
Aurindam Jana
aea3297932 QmlJSInspector: Reposition the Tool Bar 
Change-Id: I529f976e90fef1670e65b650525b6f31e8b8f397
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-28 13:06:10 +02:00
Kai Koehne
2af301e253 Debugger: Bring Qt Creator to foreground if app interrupts 
Change-Id: I07795f61b79cce9687d0ae2bff3cc19534ec08d6
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-03-23 11:29:01 +01:00
hjk
fbeeac5672 runconfiguration: interface cleanup 
Change-Id: I8a6fe6598d3d167a20c17e7f695fb6eff3fa0874
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-02-23 16:03:17 +01:00
hjk
503c6e2684 projectexplorer: Make the debugger language chooser a (hardcoded) "aspect" 
This is the first step of a larger refactoring. The plan is to make
debuggersettings more orthogonal to individual runconfiguration
implementation. This patch alone already pushes the settings handling
to the debugger plugin and removes code duplication in the
runconfiguration implementation.

Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-21 12:21:38 +01:00
Aurindam Jana
147396d764 ScriptConsole: Refactor to QtMessageLogWindow 
Move QML/JS independent classes to common Debugger
code. A Debugger Engine needs to override
evaluateScriptExpression() to provide engine
specific script evaluation.

Change-Id: I02b23b380a3eb1b12003b30ded0b7d075e44dfed
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-20 17:51:05 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
Kai Koehne
c06727ca17 Debugger: Fix runtime warning if QmlJsInspector plugin is not loaded 
Change-Id: I9c8132b4af2d1664622e4574e0c442a96b88c778
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-19 15:03:24 +01:00
hjk
47fedc3d8a debugger: sort entries in Windows->Views the same way as in the dock context menus 
Task-number: QTCREATORBUG-6179
Change-Id: I1bc02ebce6de7ff5c12d7baf7c585a414f3972d5
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-12 17:05:47 +01:00
Friedemann Kleint
a92e38f47f Debugger: Compile with QT_NO_CAST_FROM_ASCII. 
(except gdbmi.cpp, name_demangler.cpp). Remove some unneeded
conversions, change some maps to take QByteArray keys.

Change-Id: I010f1251998a441fe5c8c87901b1e0c277c0391c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-21 14:07:12 +01:00
Daniel Teske
5b5e12ab69 Debugger: remove updateUiOnFileListChanged 
Apparently there's no reason for the connect. Also the disconnect when
the project changed was missing.

Change-Id: Ib04c8f93b532be6e4cd947df00640746721186af
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-12-06 12:55:14 +01:00
Daniel Teske
617fd25742 Debugger: Make pointers to Project/Target/RunConfiguration bald 
They don't need to be weakpointers as the ProjectExplorer sends a signal
possibly with a null pointer if a project/targer/runconfiguration is
removed. Though switching project does not result in a target changed
signal. Take fully care of that case.

Change-Id: I8db1008dd7d689b1e0a2d444907977d0c19c0533
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-06 12:52:35 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Kai Koehne
c9330dc66e Debugger: Avoid runtime warning when QmlJSInspector plugin is not loaded 
Check whether there's actually a toolbar for QML registered.

Change-Id: I58ba1330c2bbc4ac0a8962474662a5e76e902f17
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-10-31 17:13:54 +01:00
Kai Koehne
1dfe884c17 Debugger: Make QML Script console visible by default 
Show qml script console widget under breakpoints for QML / QML/CPP
based debugging.

Change-Id: I782506bbe7bb986a6753756560427b3666425e78
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-10-28 17:02:39 +02:00
Kai Koehne
f5ec093e3b Debugger: Automatically adapt to the languages the running engine supports 
We used to get the layout only from the current/last run configuration. However,
this fails for engines started by other means (Debug->Start Debugging submenu).

Change-Id: I87e12457c7cd68a326ac1827298a3542e149199b
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-13 17:43:57 +02:00
Kai Koehne
9fb498a76c DebuggerMainWindow: Fix issues with default layout 
Make sure all docks are properly tabified, even when not visible.

Change-Id: I4c7eb0016d95c8c75d63db939569e6d9e32e57ae
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-10-12 14:37:06 +02:00
Kai Koehne
45b642cb08 Debugger: Remove commented out code 
Change-Id: I17ecaed325cb362fad008a77533dafc442a0209e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-12 14:37:02 +02:00
Kai Koehne
1356a349cf Debugger: Initialize default layout for both QML and QML/CPP 
Change-Id: Ib52c1664f0273d573bed28b8640d77e5292d40e3
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-12 14:36:56 +02:00
Kai Koehne
fa2a91a851 Debugger: "Reset to default layout" resets both QML and QML/CPP layout 
Change-Id: Ia2d0de65d772826697ec51e6f82dc0e3fe36e05b
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-12 14:36:51 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
4fa528813e Debugger: Fix exit crash in debug mode (X11). 
Double deletion of debug mode widgets.
 2011-03-15 14:52:35 +01:00
con
46ecaecc13 Remove dock widget handles from debugger tool bar. 
Otherwise it's possible to remove the tool bar without ever getting it
back.
 2011-02-17 16:52:06 +01:00
hjk
0639d60fc9 debugger: raise the break dock in the default layout 2011-02-17 14:47:33 +01:00
con
ea4119724f Debugger default layout was hiding the debugger tool bar. 2011-02-17 14:31:09 +01:00
Thorbjørn Lindeijer
f5c192bf38 Introduced a QML-specific debugger tool bar 
This one has the common debugger actions as well as the QML Observer
specific part. This makes sure those actions are generally available and
not only from the QML Observer dock widget.

The filter in the tool bar should still be moved back.

Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-02-16 13:36:12 +01:00
Thorbjørn Lindeijer
7741db1220 Code cosmetics 2011-02-16 11:36:06 +01:00
hjk
9a952cf495 debugger: remove the local 'cached' of QDockWidget * in DebuggerMainWindow 2011-02-07 14:44:28 +01:00
Friedemann Kleint
c379aae1c9 Compile on Windows. 2011-01-31 15:27:59 +01:00
con
6bea521e6b Debugger view menus were enabled when they shouldn't be 2011-01-31 15:18:35 +01:00
Friedemann Kleint
808408eeea 10n: Fix tr() issues. 2011-01-19 16:50:03 +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
hjk
48c2dccd75 debugger: more uiswitcher cleanup 
further disentangling of debugger dockwidget updates
remove unneeded variable
make updateDockWidgetSettings private
make dockwidget eventfilter slightly less heavy
 2010-12-06 13:01:23 +01:00
hjk
9f1737b452 debugger: rework construction of initial dockwidget arrangement 
This is now also postponed to the first switch to debug mode.
 2010-12-06 10:26:21 +01:00
hjk
047847bdd7 debugger: fix startup crash 
Task-number: QTCREATORBUG-3292
 2010-12-06 08:05:46 +01:00
Friedemann Kleint
d2e8819f9a Set some object names for easier debugging. 2010-12-03 17:31:01 +01:00
hjk
2c46a935df debugger: make more bits private 2010-12-03 16:18:50 +01:00
hjk
fde3ced40c debugger: cleanup dockwidget handling 2010-12-03 15:55:17 +01:00
hjk
f8e70add25 debugger: move dockwidget ownership to the mainwindow 2010-12-03 15:04:16 +01:00
hjk
2d3aaa1b02 debugger: merge the two setSimpleDockWidgetArrangement() functions 2010-12-03 11:37:28 +01:00
hjk
e2bf0c71fb debugger: remove unneeded parameter to setSimpleDockWidgetArrangement 2010-12-03 11:37:28 +01:00
hjk
7d90eefb9b debugger: remove dead code 2010-12-03 11:37:28 +01:00
hjk
ebce274d10 debugger: simplify DebuggerMainWindow creation 2010-12-03 11:37:28 +01:00