Eike Ziller 55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD ...

Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646

2013-04-18 12:54:37 +02:00

..

actionmanager

Clean headers in Core-plugin.

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

dialogs

tr()-Fixes for ReadOnlyFilesDialog.

2013-04-15 15:03:57 +02:00

editormanager

EditorManager: Remove code duplication.

2013-04-18 12:13:31 +02:00

images

Adapt qbs project files to new installation approach.

2013-01-24 13:02:32 +01:00

progressmanager

Show build and search progress detail also in status bar.

2013-04-10 14:21:25 +02:00

scriptmanager

Clean headers in Core-plugin.

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

basefilewizard.cpp

Open project if it was not added to VC system.

2013-04-02 09:21:02 +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

Fix installation of desktop icons.

2012-10-08 16:18:35 +02:00

coreconstants.h

Make adding variable support to textcontrol easier.

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

coreplugin_dependencies.pri

make library and plugin dependencies declarative

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

coreplugin.cpp

Clean headers in Core-plugin.

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

coreplugin.h

Client: Block until editor is closed

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

coreplugin.pro

Editor: Added Dialog for read only files.

2013-04-08 10:16:11 +02:00

coreplugin.qbs

Editor: Added Dialog for read only files.

2013-04-08 10:16:11 +02:00

designmode.cpp

Clean headers in Core-plugin.

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

designmode.h

Incremented year in copyright info

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

documentmanager.cpp

tr()-Fixes for ReadOnlyFilesDialog.

2013-04-15 15:03:57 +02:00

documentmanager.h

Editor: Added Dialog for read only files.

2013-04-08 10:16:11 +02:00

editmode.cpp

Clean headers in Core-plugin.

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

editmode.h

Incremented year in copyright info

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

editortoolbar.cpp

Clean headers in Core-plugin.

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

editortoolbar.h

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

2013-03-13 14:05:40 +01: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

Clean headers in Core-plugin.

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

fancyactionbar.h

Incremented year in copyright info

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

fancyactionbar.qrc

Improved some icons and removed unused or redundant ones

2010-04-09 17:43:22 +02:00

fancytabwidget.cpp

Clean headers in Core-plugin.

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

fancytabwidget.h

Incremented year in copyright info

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

featureprovider.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

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

2013-04-18 12:54:37 +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

Incremented year in copyright info

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

generatedfile.h

Incremented year in copyright info

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

helpmanager.cpp

Incremented year in copyright info

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

helpmanager.h

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

Core: Remove unneeded ifdefs.

2013-03-15 10:00:08 +01:00

icore.h

Make variable manager static.

2013-03-13 17:28:46 +01:00

icorelistener.h

Doc: replace deprecated QDoc commands

2013-02-06 09:44:18 +01:00

id.cpp

Core: Remove Core::Id(QByteArray) constructor

2013-04-04 16:47:59 +02:00

id.h

Core: Remove Core::Id(QByteArray) constructor

2013-04-04 16:47:59 +02:00

idocument.cpp

Merge remote-tracking branch 'origin/2.6'

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

idocument.h

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

Move progress indicators out of mode bar.

2013-04-09 15:50:25 +02:00

mainwindow.h

Client: Block until editor is closed

2013-03-15 12:24:52 +01: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

Clean headers in Core-plugin.

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

messagemanager.h

MessageManager: Remove no longer used printToOutputPane functions

2013-03-25 11:09:21 +01: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

Mime: Use string comparisons instead of regexps for simple globbing

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

mimedatabase.h

Mime: Use string comparisons instead of regexps for simple globbing

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

mimetypemagicdialog.cpp

Clean headers in Core-plugin.

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

mimetypemagicdialog.h

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

Clean headers in Core-plugin.

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

modemanager.h

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

Clean headers in Core-plugin.

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

navigationwidget.h

Incremented year in copyright info

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

outputpane.cpp

Clean headers in Core-plugin.

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

outputpane.h

Incremented year in copyright info

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

outputpanemanager.cpp

Clean headers in Core-plugin.

2013-03-27 09:31:54 +01: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

Incremented year in copyright info

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

removefiledialog.h

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01: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

Incremented year in copyright info

2013-01-29 16:27:03 +01: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

Clean headers in Core-plugin.

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

variablemanager.h

Clean headers in Core-plugin.

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

vcsmanager.cpp

Clean headers in Core-plugin.

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

vcsmanager.h

Incremented year in copyright info

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

versiondialog.cpp

Clean headers in Core-plugin.

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

versiondialog.h

Incremented year in copyright info

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