Eike Ziller a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD ...

Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9

2013-07-08 15:01:17 +02:00

..

actionmanager

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

dialogs

Merge remote-tracking branch 'origin/2.8'

2013-06-25 10:14:14 +02:00

editormanager

Add EditorModel::openDocumentCount and use it.

2013-07-02 12:17:30 +02:00

images

update qbs files

2013-06-20 15:31:39 +02:00

progressmanager

Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-08 15:01:17 +02:00

basefilewizard.cpp

Merge remote-tracking branch 'origin/2.8'

2013-06-25 10:14:14 +02:00

basefilewizard.h

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

core_global.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

Core.pluginspec.in

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

core.qrc

Add a DiffShowEditor showing an additional info

2013-06-19 09:11:42 +02:00

coreconstants.h

Add a DiffShowEditor showing an additional info

2013-06-19 09:11:42 +02:00

coreplugin_dependencies.pri

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

coreplugin.cpp

Add split in new window action for editor views.

2013-05-08 13:07:05 +02:00

coreplugin.h

Client: Block until editor is closed

2013-03-15 12:24:52 +01:00

coreplugin.pro

Remove script manager and script debugger engine.

2013-07-01 12:01:11 +02:00

coreplugin.qbs

Remove script manager and script debugger engine.

2013-07-01 12:01:11 +02:00

designmode.cpp

Switch less often to edit mode

2013-06-05 09:43:14 +02:00

designmode.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

documentmanager.cpp

Fix external file change notification in case of multiple windows.

2013-06-21 16:22:37 +02:00

documentmanager.h

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

editmode.cpp

Switch less often to edit mode

2013-06-05 09:43:14 +02:00

editmode.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

editortoolbar.cpp

Switch less often to edit mode

2013-06-05 09:43:14 +02:00

editortoolbar.h

Add split in new window action for editor views.

2013-05-08 13:07:05 +02:00

externaltool.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

externaltool.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

externaltoolmanager.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

fancyactionbar.cpp

FancyToolButton: remove forceVisible

2013-06-20 13:17:50 +02:00

fancyactionbar.h

FancyToolButton: remove forceVisible

2013-06-20 13:17:50 +02:00

fancyactionbar.qrc

Add 2x icons for retina displays.

2013-04-19 10:37:29 +02:00

fancytabwidget.cpp

Add an action to show/hide the mode bar on the far left.

2013-05-21 15:07:03 +02:00

fancytabwidget.h

Fix width of mode selector

2013-06-12 17:16:31 +02:00

featureprovider.cpp

Merge remote-tracking branch 'origin/2.8'

2013-06-25 10:14:14 +02:00

featureprovider.h

Fix Krazy warnings about includes/header guards in Core plugin.

2013-03-13 14:05:40 +01:00

fileiconprovider.cpp

Fix Krazy warnings about includes/header guards in Core plugin.

2013-03-13 14:05:40 +01:00

fileiconprovider.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

fileutils.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

fileutils.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

findplaceholder.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

findplaceholder.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

generalsettings.cpp

Settings: Simplify some user code

2013-05-29 09:40:17 +02:00

generalsettings.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

generalsettings.ui

Merge remote-tracking branch 'origin/2.7'

2013-03-08 11:39:33 +01:00

generatedfile.cpp

Doc: use standard wording in \brief commands

2013-06-20 11:22:47 +02:00

generatedfile.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

helpmanager.cpp

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

helpmanager.h

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

icontext.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

icontext.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

icore.cpp

Remove script manager and script debugger engine.

2013-07-01 12:01:11 +02:00

icore.h

Remove script manager and script debugger engine.

2013-07-01 12:01:11 +02:00

icorelistener.h

Doc: use standard wording in \brief commands

2013-06-20 11:22:47 +02:00

id.cpp

Merge remote-tracking branch 'origin/2.8'

2013-06-25 10:14:14 +02:00

id.h

Core: Fix build.

2013-06-06 18:00:29 +02:00

idocument.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

idocument.h

Core: Let IDocument also report failed file reload operations

2013-06-24 11:13:29 +02:00

idocumentfactory.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

ifilewizardextension.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

imode.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

imode.h

Switch less often to edit mode

2013-06-05 09:43:14 +02:00

inavigationwidgetfactory.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

inavigationwidgetfactory.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

infobar.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

infobar.h

Describe "Reset warnings" button

2013-03-06 12:26:59 +01:00

ioutputpane.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

iversioncontrol.cpp

ClearCase: Don't show Hijack button for dynamic view

2013-03-11 14:18:51 +01:00

iversioncontrol.h

ClearCase: Don't show Hijack button for dynamic view

2013-03-11 14:18:51 +01:00

macfullscreen.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

macfullscreen.mm

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

mainwindow.cpp

Remove script manager and script debugger engine.

2013-07-01 12:01:11 +02:00

mainwindow.h

Remove script manager and script debugger engine.

2013-07-01 12:01:11 +02:00

manhattanstyle.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

manhattanstyle.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

messagemanager.cpp

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

messagemanager.h

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

messageoutputwindow.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

messageoutputwindow.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

mimedatabase.cpp

Doc: use standard wording in \brief commands

2013-06-20 11:22:47 +02:00

mimedatabase.h

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

mimetypemagicdialog.cpp

Remove changeEvent(QEvent::LanguageChange) implementation

2013-05-27 08:58:51 +02:00

mimetypemagicdialog.h

Remove changeEvent(QEvent::LanguageChange) implementation

2013-05-27 08:58:51 +02:00

mimetypemagicdialog.ui

UI files: Do not polute the global Ui namespace

2011-11-24 10:49:41 +01:00

mimetypesettings.cpp

Mime: Use string comparisons instead of regexps for simple globbing

2013-04-17 17:13:35 +02:00

mimetypesettings.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

mimetypesettingspage.ui

Settings: Add a filter for mime types

2013-04-17 09:06:39 +02:00

minisplitter.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

minisplitter.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

modemanager.cpp

Switch less often to edit mode

2013-06-05 09:43:14 +02:00

modemanager.h

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

navigationsubwidget.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

navigationsubwidget.h

Fix Krazy warnings about includes/header guards in Core plugin.

2013-03-13 14:05:40 +01:00

navigationwidget.cpp

Make a few more shortcuts/actions raise the main window.

2013-05-21 15:06:38 +02:00

navigationwidget.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

outputpane.cpp

Call refresh before checking the splitter sizes.

2013-07-02 13:10:01 +02:00

outputpane.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

outputpanemanager.cpp

Make a few more shortcuts/actions raise the main window.

2013-05-21 15:06:38 +02:00

outputpanemanager.h

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

outputwindow.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

outputwindow.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

plugindialog.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

plugindialog.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

removefiledialog.cpp

Remove changeEvent(QEvent::LanguageChange) implementation

2013-05-27 08:58:51 +02:00

removefiledialog.h

Remove changeEvent(QEvent::LanguageChange) implementation

2013-05-27 08:58:51 +02:00

removefiledialog.ui

Added VCS integration to ResourceEditor.

2012-07-19 22:26:47 +02:00

rightpane.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

rightpane.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

settingsdatabase.cpp

Doc: use standard wording in \brief commands

2013-06-20 11:22:47 +02:00

settingsdatabase.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

sidebar.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

sidebar.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

sidebarwidget.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

sidebarwidget.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

statusbarmanager.cpp

Fix widgets flashing before start.

2013-04-10 11:01:11 +02:00

statusbarmanager.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

statusbarwidget.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

statusbarwidget.h

Add right aligned location for widget in status bar.

2013-04-09 13:05:48 +02:00

styleanimator.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

styleanimator.h

Fix Krazy warnings about includes/header guards in Core plugin.

2013-03-13 14:05:40 +01:00

tabpositionindicator.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

tabpositionindicator.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

textdocument.cpp

Doc: use standard wording in \brief commands

2013-06-20 11:22:47 +02:00

textdocument.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

toolsettings.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01:00

toolsettings.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

variablechooser.cpp

Add documentation for variable chooser.

2013-04-02 17:34:48 +02:00

variablechooser.h

Make adding variable support to textcontrol easier.

2013-03-28 17:00:34 +01:00

variablechooser.ui

UI files: Do not polute the global Ui namespace

2011-11-24 10:49:41 +01:00

variablemanager.cpp

tr()-Fixes.

2013-06-05 09:45:29 +02:00

variablemanager.h

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

vcsmanager.cpp

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

vcsmanager.h

Unify pattern used for privates and constructors

2013-07-01 11:52:35 +02:00

versiondialog.cpp

Fix escape key for "About Qt Creator"

2013-06-25 13:40:38 +02:00

versiondialog.h

Fix escape key for "About Qt Creator"

2013-06-25 13:40:38 +02:00