feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,698 Commits 108 Branches 368 Tags
4fc706d7e04abcbdd77d1687e9f4fc0971b8eb07
Commit Graph

44 Commits

Author SHA1 Message Date
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
Orgad Shaneh
dba973c933 Valgrind: Compile with QT_NO_CAST_FROM_ASCII 
Change-Id: I935579630c4d2f3a7bce69756da9eceb5e2bc005
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-27 09:06:15 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor 
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-20 08:57:35 +01: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
hjk
66bbb8b291 analyzer: add a button to shorten names of function templates 
Task-number: QTCREATORBUG-7746

Change-Id: I5ba6c5b63c319d7b65239c6b730c0da90ef20c4f
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-22 23:38:14 +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
Eike Ziller
529c0a8fe2 Merge remote-tracking branch 'origin/2.5' 2012-05-07 15:18:39 +02:00
Daniel Teske
d9a5385aa5 BaseTextMark: Use (explicit) two phase initilization 
Fixes a bug where the text in the bookmarks view is missing on initial
adding a bookmark.

Change-Id: Iefbf05e6124c0b4e911aa8d67beaa82ceeac8e21
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-03 12:58:26 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style 
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-17 09:53:44 +02:00
Robert Loehning
b41171c847 Normalized connect()s 
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-06 12:46:52 +01:00
hjk
43f69abea1 Rename {Analyzer,Debugger}ProjectSettings to *RunConfigurationAspect 
Change-Id: I5913ddaaab1a80b1557f0bcf7ebcc15e0e4b74eb
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-23 18:16:46 +01:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +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
Daniel Teske
f0f657873f Valgrind: String concanetation is faster then .arg 
Change-Id: Ia92f92f97f8c5aca6ecec31607bb60b06c316eca
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-03 09:48:46 +01:00
Daniel Molkentin
b44e541dca bugreports.qt.nokia.com -> bugreports.qt-project.org 
Change-Id: Ifc258886f7d6e7d5b02caae8994210aeef221554
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-01-26 19:58:08 +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
b0b105d575 ProjectExplorer: make currentProject static 
This saves one function call compared to the instance()->currentProject()
pattern and is typically less to type on the caller site.

Change-Id: I65568f30205fc90e2aaca7e8e7f0192241df8c85
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 19:20:13 +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
Denis Mingulov
eed531ff9e Valgrind plugin: fix for just partial usage of coreplugin/coreconstants.h values 
Valgrind plugin CallgrindTool and MemcheckTool modules sometime use
coreplugin/coreconstants.h values for icons (e.g. Core::Constants::ICON_REDO),
and sometime - an own constant is used like ":core/images/prev.png".

This commit is fixing this issue and changing everything to Core::Constants
usage.

Change-Id: I8d6f473a66a3181b03e2193314d17661df1d4cc1
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-17 12:25:10 +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
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
hjk
e08f51c21c analyzer: show busy cursor as long analysis is running 
Change-Id: I93ad6ac5e79f5e8a6f843a90b244bfc0587c070c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-13 14:04:56 +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
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
Robert Loehning
476338a6d2 Changed links to bugtracker to https 
Change-Id: I62aa9a4033399ee7fc0b55952613657f124c8fb9
Reviewed-on: http://codereview.qt.nokia.com/2791
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-10 13:44:03 +02:00
Friedemann Kleint
4f741fc7c8 Analyzer[callgrind]: Fix a crash when remote profiling. 
Task-number: QTCREATORBUG-5402

Change-Id: Ifd42befddccd28abdc5ee0a701321e1a6cf58f7f
Reviewed-on: http://codereview.qt.nokia.com/1774
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-18 17:39:35 +02:00
hjk
3cce72dcf5 analyzer: merge valgrind related settings 
This mainly reduces the number of tabs in the settings dialog.

Change-Id: I62ba5c74585648c8f495602cd4d676d0628de9b5
Reviewed-on: http://codereview.qt.nokia.com/1575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-13 15:56:48 +02:00
hjk
868613b5ed analyzer: merge dockwidget and toolbar creation. 
Now that dock and control widgets are always created as late as
possible and both are needed immediately afterward it makes sense
to merge there construction. This also reduces the chance to create
a partial tool gui in an inconsitent state.

Change-Id: Ic7f405d65b2b8f0b4ee3ff0ef991d6e4746bac0a
Reviewed-on: http://codereview.qt.nokia.com/1249
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 10:37:04 +02:00
hjk
500981b9c0 analyzer: change default dockwidget layout for callgrind tool 
Change-Id: I7bdfa0a023f813c5da5fdec1d2c8a5abff6092b7
Reviewed-on: http://codereview.qt.nokia.com/1179
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-07 10:23:24 +02:00
hjk
be452fcaff Revert "analyzer: move convenience factory back to base plugin" 
This reverts commit 06a41da04e.

Change-Id: I06a41da04e726ffd35da18d99cd2f46cb99467bf
Reviewed-on: http://codereview.qt.nokia.com/1094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-05 12:09:25 +02:00
hjk
06a41da04e analyzer: move convenience factory back to base plugin 
Change-Id: Ife82b74ce4b457dd9e6a6cc3749cb629aeeacf58
Reviewed-on: http://codereview.qt.nokia.com/1086
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-07-04 16:23:38 +02:00
hjk
36a3028b9d analyzer: refactor progress 
Change-Id: If74c8035bc83a8113c2a15dcacefa38afbbbb4d8
Reviewed-on: http://codereview.qt.nokia.com/1056
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-04 12:02:36 +02:00
hjk
2086d94866 analyzer: finish split of tools into "tools-with-modes" 
Change-Id: I82b61c07172a33b861a7d6db903ac2516019498b
Reviewed-on: http://codereview.qt.nokia.com/1054
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-04 12:02:13 +02:00
hjk
f0a0e5b1ea analyzer: move responsibility for run modes to individual tools 
Change-Id: Iaf2fa9d4c087470649336a453c6a9a7db12d220f
Reviewed-on: http://codereview.qt.nokia.com/1051
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-04 12:01:25 +02:00
hjk
99d9f065b3 analyzer: refactoring of analyzer manager 
Change-Id: I60268b8bc86e439beb3fca8f4b6a87ea03925bad
Reviewed-on: http://codereview.qt.nokia.com/1049
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-04 12:01:00 +02:00
hjk
bbe427ac1f analyzer: reorganize local/remote starts 
Change-Id: I6273ea7ea50fd2bddad3a627e4616fe93e8398b9
Reviewed-on: http://codereview.qt.nokia.com/921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 18:44:46 +02:00
hjk
b6c0f3d8a6 analyzer: refactor AnalyzerManager 
Change-Id: Id925bb638b2757ef079c21192d4e2a8cc8f08694
Reviewed-on: http://codereview.qt.nokia.com/908
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 16:27:39 +02:00
hjk
8d567174a9 analyzer: more verbosity in the tool description 
Change-Id: Ie259c78710c9e926f75595a7c22195efb7036532
Reviewed-on: http://codereview.qt.nokia.com/856
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-28 20:08:31 +02:00
hjk
11457966b3 anaylyzer: remove "goto overview" action in callgrind tool 
Change-Id: I02fcc8ef5983c9759448ea8f831f46a44eb5c184
Reviewed-on: http://codereview.qt.nokia.com/525
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-20 17:39:24 +02:00
hjk
4bd73afb4d analyzer: add 'redo' to callgrind result navigation 
Change-Id: Ic7b348fc8df57f8a4d7a361d67b2c183ef7f1a46
Reviewed-on: http://codereview.qt.nokia.com/523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-20 17:38:39 +02:00
hjk
8bb99e4c75 analyzer: merge valgrind based tool plugins 
It is hard to imagine there is a real use case that someone wants one but
absolutely not the other.

Change-Id: I58bb57912f2edeacf2d5a24e3b2eb5a81262eabd
Reviewed-on: http://codereview.qt.nokia.com/66
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-05-23 13:55:11 +02:00