feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,342 Commits 108 Branches 368 Tags
435ec2ba5107764d075c328f76c69a9f94c4c240
Commit Graph

132 Commits

Author SHA1 Message Date
Tobias Hunger
d18b61b85d Core::Id: Remove some explicit casts to Core::Id 
Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-03 11:57:23 +02:00
hjk
7dd56b5b16 Analyzer: De-noise 
Change-Id: I6c461c972a55a3b1efada0a068b33ca929d9ddc1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-02 10:54:13 +02:00
hjk
20d7d5e5b7 ProjectExplorer/Analyzer: Merge RunConfigurationAspects 
The Analyzer implementation is now simple and still generic enough
to serve as general base.

Change-Id: I050a21919bf128929b77a64da1f46d157691d849
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-08-16 16:20:45 +02:00
Tobias Hunger
0ce0cd8055 Analyzer: Silence warning about unused variable 
Change-Id: I87d83e848bccacec7afa940d2931f3702343cb4b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-15 11:45:05 +02:00
hjk
6e827fcded Analyzer: Remove now unneeded AnalyzerManager::m_tools member 
Change-Id: If084739b81ab7486d667eabb665a272bc9020d2e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-08-13 12:36:09 +02:00
hjk
4ed17ade89 Analyzer: Move extensionInitialized() out of IAnalyzerTool 
Change-Id: Idd0913ba798a04f65711591dee14cbb714440cbf
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-12 14:51:24 +02:00
hjk
5fa7b60b97 Analyzer: Cleanup settings handling 
More flexible, less over-engineered this way.

Change-Id: I3e224a6be85d3a187056d79fd506e8cf6a32c8a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-08-12 12:39:54 +02:00
hjk
e94183ca2f Analyzer: Introduce AnalzyerAction 
This wraps the menu related aspects of an IAnalyzerTool.

Change-Id: I065cb5f269a40af2137f434a7cdf915bd9a76839
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
 2013-08-08 17:41:39 +02:00
hjk
15caea1d26 Analyzer: Handle createProjectSettings outside IAnalyzerTool 
Less indirection.

Change-Id: If702a0a44c1fc96510fd1c5411fda51660dde10b
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-08 15:46:57 +02:00
Nikolai Kosjar
eddf5916b7 Fix compile error in AnalyzerManager 
Change-Id: Ic02f7f68a1edfc8e85afa4e120eea53aa9c1a49b
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-08 09:04:04 +02:00
hjk
1c56d691cc Analyzer: Remove one level of indirection in AnalyzerManager 
Change-Id: Ieb832e6aba1afbfa0d4f55ef12cad3f8333334b3
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-07 18:03:30 +02:00
hjk
91de546680 Analyzer: Flatten AnalyzerManager::addTool 
Add tool/startMode combo one by one.

Change-Id: I1e6cfe98fb1b1291cae6f440105991f3f99f2a6a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-06 16:15:05 +02:00
hjk
0d2ef9fca2 Analyzer: Inline Setting::registerTool into its only user 
Change-Id: I10f57785bd26a15aef6fe72f26e7bf28a3a8d31f
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-06 16:14:54 +02:00
hjk
d95ae65c62 Analyzer: Use action as handle for tool plus start mode 
Change-Id: I33f99f28fb99c21cc62cda57ec1ba1aa2963b065
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
 2013-08-06 16:14:41 +02:00
hjk
51b390cada Analyzer: Remove some explicit uses of Analyzer::StartMode 
Change-Id: I6d28a533d4ee2e93e4b3407e7fdd670c45886708
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-05 17:09:22 +02:00
hjk
835ef9507b Analyzer: Use the run mode stored in the parameters instead of a copy 
Change-Id: I045622efa22bfcb26f9161556ccbbfb3df08599d
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-05 15:10:47 +02:00
hjk
62af817175 Analyzer: Remove some unused code 
Change-Id: Ifa1468e357cae873df6a34380957100521317471
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-05 09:51:17 +02:00
hjk
b65390904b Analyzer: Slim down AnalyzerManager interface 
Change-Id: Ia6f4ba7a342d3ba2dfbf30511192155daf02a8d6
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-08-05 09:50:35 +02:00
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