Commit Graph

114 Commits

Author SHA1 Message Date
hjk
1ec636cbd6 Analyzer: Move common startTool implementations to IAnalyzerTool base
Change-Id: I963cb2d025a10cee75b9a9648531c4daeb1b70aa
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 09:50:28 +02:00
hjk
213cb601af Analyzer: Use AnalyzerManager for run control creation
Less code.

Change-Id: Ic26d291ada7efd05899623738d89c52b4175716c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 09:50:08 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
Friedemann Kleint
a5b3f27e57 Clean headers in AnalyerBase.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ied1c1e4c2569cf021b308e0529bcca591e87746e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-02 13:51:07 +02:00
hjk
6fce81a9cc Analyzer: Don't use deprecated Core::Id(QString)
Change-Id: Ib03600344f74b3503048cabf9e90258512bb946b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-19 15:28:04 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
2012-12-18 17:42:04 +01:00
Kai Koehne
ba71b3e9be Analyzer: Fix soft assert on startup
Fix "SOFT ASSERT: str && *str" when using the analyzer for the
first time / with nuked settings.

Change-Id: Id6f0fc8031fc8d8a24d6d4c0badfbfbdc98974a9
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-14 13:07:06 +01:00
Tobias Hunger
f720dfd4ee AnalyzerManager: Only connect signals after they can be handled
Change-Id: I0ddc894b5c7ae951e4888ada4af4d0cf7244120a
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-31 12:17:44 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Christian Kandeler
aef4280bc1 Do not use QWeakPointer to track QObjects.
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-25 10:45:36 +02:00
hjk
3a8658496a analyzer: improve wording for "wrong mode" message
Task-number: QTCREATORBUG-7747
Change-Id: I4a79e7d7047d6320f54824a019f98539d88a3c25
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-08-22 15:45:07 +02:00
Orgad Shaneh
cf9895ae01 Fix some memory leaks
Task-number: QTCREATORBUG-7645

Change-Id: I34253d063a20ebf927bf651cf68af4fe1b71bc89
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-20 09:13:09 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget*
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:15:53 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...)
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 15:19:30 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
Christian Kandeler
53a1087d13 Move SSH support into a dedicated library.
It does not belong into libUtils, which is a collection of small
unrelated utility classes.

Task-number: QTCREATORBUG-7218
Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-22 10:51:53 +02:00
Christiaan Janssen
7f3d93023e QmlProfiler: correctly manage "Application Output" controls
Change-Id: Ief08e953fa38b3eb3d9af8b0e84f793a80931868
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-08 17:26:38 +02:00
hjk
cad2966498 use Core::Id for IMode::id and IMode::type
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 10:18:12 +02:00
hjk
3487b538c0 analyzer: Fix message for "incompatible" builds.
Task-number: QTCREATORBUG-7011
Change-Id: I49e8c26f0d4affef0a7c4372915ea1608751960c
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-08 09:21:53 +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
2df4cb21fe Core::ModeManager: make some functions static
Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-27 14:52:24 +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
Friedemann Kleint
accde26139 Analyzerbase: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: If5ad70222983d5dede57fb7443262a736114b85e
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-25 17:54:00 +01:00
hjk
40466eadfe analyzer: add full namespace to signals and slots
Change-Id: I40d003fb4a3f85190c506382fb9fc8490c928845
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-24 20:18:13 +01:00
hjk
ecd9f3c439 Analyzer: more using, less noise.
Change-Id: I0a05fd489342c345bd6c455e809aa4a26c66af4b
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-24 18:51:26 +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
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
Kai Koehne
dcd8bb2181 Analyzer: Remove unused variable
Change-Id: I13ec1838110a3c8b64f07e141e522d64132eb002
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-04 11:50:21 +01:00
Nicolas Arnaud-Cormos
9b19a9c8e2 Analyzer: refactor global and project tool settings usage.
IAnalyzerTool has now 2 new virtual methods used to create the global and per-project settings.
No need to create any static factory method and pass a pointer to them to the AnalyzerGlobalSettings
instance anymore.

The Valgrind plugin is now using it, the memchecktool creates the settings for all
valgrind tools.

Change-Id: I3c5845ceb7151130032cfff4ab5b7b36ca2459d9
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-28 18:26:12 +01:00
Nicolas Arnaud-Cormos
4a8432112a Analyzer: create a run control factory for all tools.
Having one factory per tool (or plugin) created some bugs:
 * analyzer project settings being created twice
 * per-project analyzer settings widget duplicated
Also, most of the code from the run control factory were copied.

Now, the Analyzer only creates one run control factory shared among all tools, and the IAnalyzerTool
has two new virtual method: canRun and createStartParameters. It simplify the code a bit, and
creating a new analyzer tool is easier (only two classes to subclass: IAnalyzerTool and IAnalyzerEngine).

Change-Id: I4e180846a26b74b2b77cb99bc97534d680a80a4d
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-28 18:25:56 +01:00
Nicolas Arnaud-Cormos
1571b7f977 Analyzer: no need to pass a start mode when it's implicit in the name.
startRemoteTool and startLocalTool are implcicitely working remotely and localy, they don't need a mode.

Change-Id: I433ca421f68a1026979489c7f9d86b12251ec830
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-28 12:06:39 +01:00
Kai Koehne
442f2d6972 Analyzer: Remove redundant onCurrentProjectChanged
When switching projects updateRunActions is called too.

Change-Id: Icffb3413805e536a0f36a90bb4d45e09b5229b88
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-30 14:15:52 +01:00
Kai Koehne
d84b5d4596 Analyzer: Enable "Remote" tools even when no active project is loaded
Change-Id: I9eafbb4cd1de0904c7b0dc5a56be5d1d16a650f7
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-30 09:45:09 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
2011-11-18 10:16:49 +01:00
Aurindam Jana
25d351fa0a QMLProfiler: Menu entries to load/save QML trace
Added 'QML Profiler Options' menu to 'Analyze' menu to
load and save QML traces.

Change-Id: I468fbcfdf355a1caaa0d53b118f0b8b505cedefb
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-11-17 13:53:57 +01:00
hjk
8e236db9f5 mostly core and analyzer: more id-fication
Change-Id: Ic794fdc6a582f4a03d84b6220c59111044c753b9
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-15 18:25:19 +01:00
Daniel Teske
3e305f9758 AnalyzerManager: Fix analyzer actions disabled after build error
Change-Id: I7a6d29aba5acd2eafccf8b2c2fc08cc4ed6f00f3
Task-Nr: QTCREATORBUG-6318
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-15 12:56:22 +01:00
Daniel Teske
f224667dcf AnalyzerManager: Remove more dead code
Change-Id: I4a1bdd9c5f4ea0b44e7dc9b5fbf7c87ae4dbc15a
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-15 12:56:07 +01:00
Daniel Teske
571734c600 Dead code in AnalyzermManager
Change-Id: Ia51e7ed2fb64e89434405841f27842e2f84a917c
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-15 12:55:57 +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
ad9dd78aaa Analyzer: Make sure right tool is shown when triggered via menu
Selecting a tool via menu while the Analyze mode is active resulted
in the wrong 'default' tool being selected when the tool finally
forces a switch to Analyze mode. This fixes it by switching to
Analyze mode first -> default tool is shown -> selected tool is shown.

Change-Id: I36e770c932b9c13552dc3604db58837a89d637b6
Reviewed-on: http://codereview.qt-project.org/5466
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-23 17:10:48 +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
hjk
5e8843846a analyzer: disable start options if there's no project
Task-number: QTCREATORBUG-5627
Change-Id: Ia8affb07ba1d87c0b333ca3a547fc9eed32062f4
Reviewed-on: http://codereview.qt.nokia.com/2636
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-04 16:07:45 +02:00
hjk
ef0a19d926 analyzer: less global symbols
Change-Id: I2f771c7dc2a709611c68b97a5287804d4b8590fd
Reviewed-on: http://codereview.qt.nokia.com/2632
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-04 15:42:44 +02:00