feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,941 Commits 108 Branches 368 Tags
0f703ea06892bc427b3b220d0bde9a818a2e1d8b
Commit Graph

79 Commits

Author SHA1 Message Date
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
a6ff74c0d8 ProjectExplorer: use enum instead of QString for run mode 
Change-Id: Ia906944a489b09afdea59f74afbf759b4caebe37
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-11 13:52:26 +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
Eike Ziller
b0efd44d20 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
 2011-09-15 11:50:29 +02:00
Kai Koehne
e2e0db687e QmlProject: Fix debugging with C++ language 
Because no ABI was specified, gdb bailed out with 'File format not
recognized'. Instead just use the ABI from one of the toolchains
available for the Qt version (assuming that they're all compatible).

Task-number: QTCREATORBUG-5957
Change-Id: I7db9bd45c6a015c6236ae1b672909e013fad1d65
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-01 12:51:45 +02:00
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
 2011-08-10 16:03:57 +02:00
Kai Koehne
342abadf36 QmlDebugger: Hit breakpoints for simple bindings also for .qmlproject 
Make sure QML_DISABLE_OPTIMIZER is set also when debugging with
qmlobserver

Change-Id: I33aa4cd50ae184e339e3783488ba236eecdf7b33
Reviewed-on: http://codereview.qt.nokia.com/2753
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-08-09 13:40:20 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3' 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
 2011-07-25 13:57:13 +02:00
Christiaan Janssen
ed5030f124 QmlProjectManager: moved the no-observer warning dialog to qmlprojectplugin 
Change-Id: I6ce724e0db17d22616adcdf058d1f05af7124b64
Reviewed-on: http://codereview.qt.nokia.com/1929
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-21 10:54:16 +02:00
Daniel Teske
b778692510 Qml run controls automatically stop all run controls for the same file 
That's something which has been asked for multiple times. Also related
to the task below.

Change-Id: I1130a2a3527479f18bde2abfbff28fb556f437b9
Task-Nr: QTCREATORBUG-3508
Reviewed-on: http://codereview.qt.nokia.com/1844
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-07-19 18:53:15 +02:00
Daniel Teske
7d39539657 Header cleanup 
Change-Id: I86680fcac2712203cb02fd9ce6d944988e6ef340
Reviewed-on: http://codereview.qt.nokia.com/1825
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-07-19 18:09:45 +02:00
Daniel Teske
22c0f6ae0d QmlRunControlFactory: Cleaner canRun code 
Fixed a bug where the case config->qtVersion == 0 was mishandled.

Change-Id: Ic11133bcfbe402e8f7a19b99b59161f8a913a2ab
Reviewed-on: http://codereview.qt.nokia.com/1779
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-07-18 17:39:07 +02:00
Kai Koehne
3485d7f5ca QmlDebugger: Always use ',block' argument 
This will allow e.g. the JS Debugger to catch scripts running at startup.

Change-Id: I00d339b06f1ed2b716c62bd2d53a32c2b20b1ddc
Reviewed-on: http://codereview.qt.nokia.com/377
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-08 14:39:13 +02:00
hjk
b9580e3ccf debugger: let debugger attach to currently running process 
Change-Id: I4aab1aa84a3dc9211d84d59be76005a8e841239e
(cherry picked from commit 55e399b524721e3561b6c7faae8aef84bf064565)
Reviewed-on: http://codereview.qt.nokia.com/251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-31 13:34:40 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport 
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-24 18:35:11 +02:00
Thorbjørn Lindeijer
2b0266d0ee Disable observer and jsdebugger services when they're already part of Qt 
As of Qt 4.8 the observer and jsdebugger services are part of Qt. This
means the following changes are necessary in Qt Creator:

* Do not link to the QmlJSDebugger library.
* Do not create JSDebuggerAgent and QDeclarativeViewObserver instances
  in the QmlApplicationViewer and use the new declarative_debug CONFIG
  option to enable those services in Qt. This is done automatically
  for debug builds.
* Point out the QML Debugging Library and the QML Observer are "Not
  needed" in the Qt options page.
* Change the label in qmake options from "Link QML debugging library" to
  "Enable QML debugging". It still remains as a way to enable this
  functionality in release builds or for QtQuick applications not based
  on Qt Creator's template.
* Rely on qmlviewer for debugging QML UI projects rather than the
  observer, which is no longer necessary.

Reviewed-by: Kai Koehne
 2011-05-12 15:56:05 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Kai Koehne
03cf8c4b90 QmlProject: Rename QmlRunControl to QmlProjectRunControl 
It's just easier if all the classes related with the QmlProject file format
start with the same prefix.
 2011-05-04 13:05:57 +02:00
Kai Koehne
ea36927cc3 QmlDebug: Simplify logic to find the source file for a stack frame 
Get rid of custom logic to handle shadow builds (which didn't work
anyway if the qml files are from a different directory than expected).
Instead, just search for the file name in the list of files from the
project.

Reviewed-by: Christiaan Janssen
 2011-04-27 17:25:48 +02:00
con
2cf76ead26 Move OutputFormatter to Utils lib. 2011-04-26 10:45:21 +02:00
Christiaan Janssen
9a8cf34e63 QmlDebugger: breakpoints in symlinked qmlprojects 
Task-number: QTCREATORBUG-4405

Reviewed-by: Kai Koehne
 2011-04-19 17:00:38 +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
Christiaan Janssen
cbfaea1ed3 QmlProfiler: qmlproject support 
Reviewed-by: Kai Koehne
 2011-04-14 09:57:08 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
880813a3bc Fixing tons of application output 
Master fixed a bug where a newline was almost always prepended to any
output. As a side effect of that a lot of messages which outputed no
newline broke. This commit fixes the obvious ones, probably missing a
few.
 2011-04-12 19:42:25 +02:00
dt
28cf277cc1 RunControl: Show correct icon in application output 
Add a virtual icon() method to runcontrol.
Actually currently the icon only varies between modes of running.

Task-Nr: QTCREATORBUG-1232
 2011-03-28 19:58:26 +02:00
Milian Wolff
09f89d52be enable adding custom config widgets from a run control factory 
To achieve this there are two methods in IRunControlFactory you
need to implement:

1) createRunConfigurationAspect returns a IRunConfigurationAspect
which stores the settings specific to your plugin.
2) createConfigurationWidget returns a RunConfigWidget that will
be shown in the project settings

Merge-request: 258
Reviewed-by: hjk <qtc-committer@nokia.com>
 2011-02-28 12:23:12 +01:00
Thorbjørn Lindeijer
7741db1220 Code cosmetics 2011-02-16 11:36:06 +01:00
Kai Koehne
a39510b1eb QmlJSDebug: Fix debugging of qmlobserver on Windows 
-qmljsdebug argument must not be escaped by parenthesis, and
be the first argument.
 2011-02-08 17:24:49 +01:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
hjk
1b1663a289 introduce a appendMessage overload not requiring the 'this' parameter 2011-01-10 10:18:45 +01:00
Friedemann Kleint
a7eccce733 Debugger: Header cleanup 2011-01-10 10:14:23 +01:00
hjk
ef806894e8 runcontrols: use ProjectExplorrer::OutputFormat for format selection 2011-01-07 16:26:56 +01:00
hjk
8fd480bd21 merge addToOutputWindow and addToOutputWindowInline 2011-01-07 16:26:55 +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
a77353b414 debugger: move DebuggerMainWindow to debuggermainwindow.{h,cpp} 2010-12-02 17:43:14 +01:00
Kai Koehne
e398225cd0 QmlProject: Allow user to change process environment 
Task-number: QTCREATORBUG-2600
 2010-11-29 14:18:11 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling 
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
 2010-11-17 13:19:07 +01:00
dt
6683b40844 ProjectExplorer + Debugger: Move Debug Action to the Debugger plugin 
Since all the debuggers are implemented in the debuggerplugin, that's a
natural place to put the action.
 2010-11-12 20:18:29 +01:00
hjk
2161e0f6d9 debugger: refactoring of the plugin interface 
There's  some 'external' and some 'internal' part now. Other plugins
are only supposed the external interface.
 2010-11-10 12:08:23 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header. 
Acked-By: dt
 2010-11-01 14:25:24 +01:00
Friedemann Kleint
f1fb0bddb1 Debugger/JS Code model: Set environment for QML tools correctly. 
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
 2010-10-26 15:39:37 +02:00
Pawel Polanski
e46a99bcc0 Small fix in a text 
Reviewed-by: Friedemann Kleint
 2010-10-11 14:47:58 +02:00
Kai Koehne
6267671858 QmlProject: Disable debug action if qmlobserver cannot be built 
QmlObserver right now requires 4.7.1 minimum. There's no gain in
telling the user that he needs qmlobserver to debug, if it can't be
build with 4.7.0 anyway.

Reviewed-by: Christiaan Janssen
 2010-10-05 12:45:10 +02:00
Kai Koehne
325af72012 QmlProject: Always use qmlobserver for debugging projects 
Also only warn about missing qmlobserver when actually trying to
debug a .qmlproject.

Reviewed-by: Christiaan Janssen
 2010-10-04 16:59:58 +02:00
Kai Koehne
c03fff0968 QmlProject: Stop program when exiting creator 
Task-number: QTCREATORBUG-2501
 2010-10-04 09:44:18 +02:00
Lasse Holmstedt
89443cfb1f QML Observer: Complain about not having it if debugging .qmlprojects 
Reviewed-by: hjk
 2010-09-29 09:39:42 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00