Oswald Buddenhagen ddea5994f3 Merge remote-tracking branch 'origin/3.5' ...

Conflicts:
	scripts/deployqtHelper_mac.sh

Change-Id: Ia0d5fef8c28e0bfb3b0c703ad3652e2d70d9e7d1

2015-07-17 17:25:26 +02:00

..

actionmanager

ActionManager: Remove remaining uses of Id::uniqueIdentifier()

2015-06-24 08:36:47 +00:00

dialogs

NewDialog: Simplify code a bit

2015-06-03 13:08:24 +00:00

editormanager

Fix that locator filters weren't accepting column numbers

2015-07-14 10:16:04 +00:00

find

Editor: Highlight Search results in scrollbar.

2015-06-16 09:02:14 +00:00

images

PNG: Run pngcrush on images with iCCP or sRGB profiles

2015-07-03 09:50:46 +00:00

locator

Fix that locator filters weren't accepting column numbers

2015-07-14 10:16:04 +00:00

progressmanager

Core: Fix compilation

2015-03-06 06:36:20 +00:00

themeeditor

themeeditor: s/Q_DECL_OVERRIDE/override/g

2015-06-04 08:31:26 +00:00

basefilewizard.cpp

BaseFileWizard: Initialize pages again

2015-06-04 12:43:37 +00:00

basefilewizard.h

Make BaseFileWizard async

2015-06-03 13:08:13 +00:00

basefilewizardfactory.cpp

Make BaseFileWizard async

2015-06-03 13:08:13 +00:00

basefilewizardfactory.h

Make BaseFileWizard async

2015-06-03 13:08:13 +00:00

core_global.h

Update License

2015-01-16 12:37:56 +01:00

Core.json.in

Update License

2015-01-16 12:37:56 +01:00

core.qrc

Target Selector: Fall back to built-in Desktop icon

2015-05-21 15:51:37 +00:00

coreconstants.h

Refactor UpdateInfo plugin

2015-06-16 11:12:12 +00:00

corejsextensions.cpp

JsExpander: Add methods to test file/directory existence

2015-05-12 15:17:39 +00:00

corejsextensions.h

JsExpander: Add methods to test file/directory existence

2015-05-12 15:17:39 +00:00

coreplugin_dependencies.pri

Qbs/qmake: Fix dependencies of plugins

2014-02-11 13:23:26 +01:00

coreplugin.cpp

Core: Add HostOs information to MacroExpander

2015-06-10 11:57:11 +00:00

coreplugin.h

Fix parsing of filename with position when -client is used

2015-03-09 16:10:03 +00:00

coreplugin.pro

Vcs: Split up VcsCommand

2015-05-04 15:27:25 +00:00

coreplugin.qbs

Editor: Highlight Search results in scrollbar.

2015-06-16 09:02:14 +00:00

designmode.cpp

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

designmode.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

documentmanager.cpp

Revert "Core: Reinitialize change notification after saving"

2015-07-06 11:04:16 +00:00

documentmanager.h

Move Open With... handling to editor manager.

2015-06-02 07:00:50 +00:00

editmode.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

editmode.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

editortoolbar.cpp

Introduce dragging for all explorer nodes.

2015-06-15 08:12:56 +00:00

editortoolbar.h

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

externaltool.cpp

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

externaltool.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

externaltoolmanager.cpp

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

externaltoolmanager.h

Core: Modernize connections in ExternalToolManager

2015-02-19 14:09:53 +00:00

fancyactionbar.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

fancyactionbar.h

Update License

2015-01-16 12:37:56 +01:00

fancyactionbar.qrc

Help: Move Help icons from Core to Help

2014-06-02 13:27:25 +02:00

fancytabwidget.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

fancytabwidget.h

Update License

2015-01-16 12:37:56 +01:00

featureprovider.cpp

Move some code from QtVersionNumber to FeatureSet

2015-06-25 14:09:19 +00:00

featureprovider.h

Move some code from QtVersionNumber to FeatureSet

2015-06-25 14:09:19 +00:00

fileiconprovider.cpp

Use new mime database

2015-02-17 13:00:07 +00:00

fileiconprovider.h

Use new mime database

2015-02-17 13:00:07 +00:00

fileutils.cpp

SettingsDialog: Remove CategoryId parameter from callers

2015-02-24 13:52:00 +00:00

fileutils.h

Update License

2015-01-16 12:37:56 +01:00

findplaceholder.cpp

Update License

2015-01-16 12:37:56 +01:00

findplaceholder.h

Update License

2015-01-16 12:37:56 +01:00

generalsettings.cpp

EditorManager: Warn before opening big text files

2015-06-16 09:07:53 +00:00

generalsettings.h

EditorManager: Warn before opening big text files

2015-06-16 09:07:53 +00:00

generalsettings.ui

EditorManager: Warn before opening big text files

2015-06-16 09:07:53 +00:00

generatedfile.cpp

Update License

2015-01-16 12:37:56 +01:00

generatedfile.h

Update License

2015-01-16 12:37:56 +01:00

helpmanager.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

helpmanager.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

icontext.cpp

Update License

2015-01-16 12:37:56 +01:00

icontext.h

Update License

2015-01-16 12:37:56 +01:00

icore.cpp

Use a proper libexec path for Unix builds.

2015-07-09 09:08:01 +00:00

icore.h

Wizards: Treat running wizards in the same way as a running NewDialog

2015-06-03 08:07:29 +00:00

icorelistener.cpp

Update License

2015-01-16 12:37:56 +01:00

icorelistener.h

Update License

2015-01-16 12:37:56 +01:00

id.cpp

Core: Remove unused Id::registerId

2015-06-19 11:09:15 +00:00

id.h

Core: Make Id(int) constructor less accessible

2015-06-19 12:12:17 +00:00

idocument.cpp

Editor manager: Abort with a single message if file is not readable.

2015-06-10 15:32:55 +00:00

idocument.h

Add override to IDocument hierarchy

2015-06-11 09:32:18 +00:00

idocumentfactory.cpp

Update License

2015-01-16 12:37:56 +01:00

idocumentfactory.h

Update License

2015-01-16 12:37:56 +01:00

ifilewizardextension.h

Update License

2015-01-16 12:37:56 +01:00

imode.cpp

Update License

2015-01-16 12:37:56 +01:00

imode.h

Update License

2015-01-16 12:37:56 +01:00

inavigationwidgetfactory.cpp

Update License

2015-01-16 12:37:56 +01:00

inavigationwidgetfactory.h

Update License

2015-01-16 12:37:56 +01:00

infobar.cpp

Core: Reduce use of Id::fromUniqueIdentifier in the Infobar

2015-06-22 06:55:39 +00:00

infobar.h

Core: Reduce use of Id::fromUniqueIdentifier in the Infobar

2015-06-22 06:55:39 +00:00

ioutputpane.cpp

Update License

2015-01-16 12:37:56 +01:00

ioutputpane.h

Update License

2015-01-16 12:37:56 +01:00

iversioncontrol.cpp

IVersionControl: Add method to get a ShellCommand for initial checkouts

2015-05-11 11:51:53 +00:00

iversioncontrol.h

IVersionControl: Add method to get a ShellCommand for initial checkouts

2015-05-11 11:51:53 +00:00

iwelcomepage.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

iwelcomepage.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

iwizardfactory.cpp

Wizards: Do not crash when dialogs are still open on quit

2015-06-04 14:40:37 +00:00

iwizardfactory.h

Wizards: Bring already running wizards to the front

2015-06-03 13:29:12 +00:00

jsexpander.cpp

Core: Replace usage of QScriptEngine with QJSEngine

2015-04-01 14:55:07 +00:00

jsexpander.h

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

mainwindow.cpp

Refactor UpdateInfo plugin

2015-06-16 11:12:12 +00:00

mainwindow.h

Introduce dragging for all explorer nodes.

2015-06-15 08:12:56 +00:00

manhattanstyle.cpp

Theming: Use a light shade for pressed toolbuttons in dark theme

2015-07-08 07:27:09 +00:00

manhattanstyle.h

Target Selector: Fall back to built-in Desktop icon

2015-05-21 15:51:37 +00:00

messagebox.cpp

Move Utils::AsynchronousMessageBox to Core::AsynchronousMessageBox

2014-11-25 12:07:13 +01:00

messagebox.h

Move Utils::AsynchronousMessageBox to Core::AsynchronousMessageBox

2014-11-25 12:07:13 +01:00

messagemanager.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

messagemanager.h

Update License

2015-01-16 12:37:56 +01:00

messageoutputwindow.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

messageoutputwindow.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

mimetypemagicdialog.cpp

MimeDatabase: Allow regular expressions for magic rules

2015-03-25 15:39:22 +00:00

mimetypemagicdialog.h

MimeDatabase: Allow regular expressions for magic rules

2015-03-25 15:39:22 +00:00

mimetypemagicdialog.ui

MimeDatabase: Allow regular expressions for magic rules

2015-03-25 15:39:22 +00:00

mimetypesettings.cpp

Mime settings: Fix crash when reading invalid custom data

2015-03-05 11:15:32 +00:00

mimetypesettings.h

Mime type settings: Restore user changes

2015-02-17 15:19:17 +00:00

mimetypesettingspage.ui

MimeTypeSettings: Use QTreeView instead of QTableView

2014-06-16 11:57:36 +02:00

minisplitter.cpp

Update License

2015-01-16 12:37:56 +01:00

minisplitter.h

Update License

2015-01-16 12:37:56 +01:00

modemanager.cpp

ModeManager: Remove one use of Id::fromUniqueIdentifier and Co.

2015-06-23 09:59:27 +00:00

modemanager.h

ModeManager: Remove one use of Id::fromUniqueIdentifier and Co.

2015-06-23 09:59:27 +00:00

navigationsubwidget.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

navigationsubwidget.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

navigationwidget.cpp

Fix untranslated messages

2015-05-19 12:17:18 +00:00

navigationwidget.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

opendocumentstreeview.cpp

Update License

2015-01-16 12:37:56 +01:00

opendocumentstreeview.h

Update License

2015-01-16 12:37:56 +01:00

outputpane.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

outputpane.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

outputpanemanager.cpp

Raise main window when opening output panes with focus request.

2015-03-19 16:17:50 +00:00

outputpanemanager.h

Update License

2015-01-16 12:37:56 +01:00

outputwindow.cpp

Make OutputWindow a bit faster

2015-05-18 11:06:17 +00:00

outputwindow.h

Make OutputWindow a bit faster

2015-05-18 11:06:17 +00:00

patchtool.cpp

Utils: Make SynchronousProcess use second based timeouts

2015-04-15 12:42:46 +00:00

patchtool.h

Update License

2015-01-16 12:37:56 +01:00

plugindialog.cpp

Add filtering to About Plugins.

2015-04-13 09:10:00 +00:00

plugindialog.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

removefiledialog.cpp

Update License

2015-01-16 12:37:56 +01:00

removefiledialog.h

Update License

2015-01-16 12:37:56 +01:00

removefiledialog.ui

ProjectExplorer: Make remove file dialog a bit wider

2013-12-10 13:17:46 +01:00

rightpane.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

rightpane.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

settingsdatabase.cpp

Update License

2015-01-16 12:37:56 +01:00

settingsdatabase.h

Update License

2015-01-16 12:37:56 +01:00

shellcommand.cpp

Vcs: Split up VcsCommand

2015-05-04 15:27:25 +00:00

shellcommand.h

Vcs: Split up VcsCommand

2015-05-04 15:27:25 +00:00

sidebar.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

sidebar.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

sidebarwidget.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

sidebarwidget.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

statusbarmanager.cpp

Update License

2015-01-16 12:37:56 +01:00

statusbarmanager.h

Update License

2015-01-16 12:37:56 +01:00

statusbarwidget.cpp

Update License

2015-01-16 12:37:56 +01:00

statusbarwidget.h

Update License

2015-01-16 12:37:56 +01:00

styleanimator.cpp

Update License

2015-01-16 12:37:56 +01:00

styleanimator.h

Update License

2015-01-16 12:37:56 +01:00

tabpositionindicator.cpp

Update License

2015-01-16 12:37:56 +01:00

tabpositionindicator.h

Update License

2015-01-16 12:37:56 +01:00

testdatadir.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

testdatadir.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

textdocument.cpp

Update License

2015-01-16 12:37:56 +01:00

textdocument.h

Add override to IDocument hierarchy

2015-06-11 09:32:18 +00:00

themesettings.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

themesettings.h

Update License

2015-01-16 12:37:56 +01:00

themesettings.ui

Theming: Hide the buttons in the theme selector

2014-11-20 16:25:42 +01:00

themesettingswidget.cpp

ThemeEntry: initialize member in ctor

2015-02-25 12:56:29 +00:00

themesettingswidget.h

Update License

2015-01-16 12:37:56 +01:00

toolsettings.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

toolsettings.h

Update License

2015-01-16 12:37:56 +01:00

variablechooser.cpp

VariableChooser: Make help text selectable

2015-07-07 09:57:57 +00:00

variablechooser.h

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

vcsmanager.cpp

use existing versionControls() instead allVersionControls()

2015-07-01 13:08:42 +00:00

vcsmanager.h

Clean exported headers of the Core plugin.

2015-03-05 07:18:14 +00:00

versiondialog.cpp

Make Qt Creator build with -Werror=date-time

2015-02-13 16:58:39 +00:00

versiondialog.h

Update License

2015-01-16 12:37:56 +01:00

windowsupport.cpp

Wizards: Do not crash when dialogs are still open on quit

2015-06-04 14:40:37 +00:00

windowsupport.h

Wizards: Do not crash when dialogs are still open on quit

2015-06-04 14:40:37 +00:00