Eike Ziller 99b2eb1ca9 Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3

2013-03-18 10:19:14 +01:00

..

codeassist

Fix Krazy warnings about includes/header guards in Text Editor.

2013-03-12 16:18:53 +01:00

generichighlighter

Fix Krazy warnings about includes/header guards in Text Editor.

2013-03-12 16:18:53 +01:00

images

TextEditor: Fix incorrect dependency to CppEditor resources

2012-01-30 14:06:23 +01:00

snippets

Fix Krazy warnings about values or keys iteration in Editor/C++.

2013-03-15 12:43:48 +01:00

autocompleter.cpp

Incremented year in copyright info

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

autocompleter.h

Incremented year in copyright info

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

basefilefind_p.h

Incremented year in copyright info

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

basefilefind.cpp

CurrentProjectFind: Correct enabled/disable logic

2013-02-13 13:48:35 +01:00

basefilefind.h

CurrentProjectFind: Correct enabled/disable logic

2013-02-13 13:48:35 +01:00

basehoverhandler.cpp

Merge remote-tracking branch 'origin/2.6'

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

basehoverhandler.h

Incremented year in copyright info

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

basetextdocument.cpp

Do not clean whitespaces/ensure final line in autosave

2013-02-13 12:31:12 +01:00

basetextdocument.h

PlainTextEditor: Use info suppression for syntax highlighting

2013-02-08 13:04:54 +01:00

basetextdocumentlayout.cpp

Merge remote-tracking branch 'origin/2.6'

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

basetextdocumentlayout.h

Merge remote-tracking branch 'origin/2.6'

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

basetexteditor_p.h

Fix Krazy warnings about includes/header guards in Text Editor.

2013-03-12 16:18:53 +01:00

basetexteditor.cpp

TextEditor: Remove old qDebug()

2013-03-18 07:50:55 +01:00

basetexteditor.h

CPP, QmlJs editors: don't indent when moving commented lines up/down.

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

basetextmark.cpp

Merge remote-tracking branch 'origin/2.6'

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

basetextmark.h

Incremented year in copyright info

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

behaviorsettings.cpp

Incremented year in copyright info

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

behaviorsettings.h

Incremented year in copyright info

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

behaviorsettingspage.cpp

Fixed the missing margin at Text Editor > Behavior settings

2013-02-26 12:57:50 +01:00

behaviorsettingspage.h

Merge remote-tracking branch 'origin/2.6'

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

behaviorsettingspage.ui

Fixed the missing margin at Text Editor > Behavior settings

2013-02-26 12:57:50 +01:00

behaviorsettingswidget.cpp

Incremented year in copyright info

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

behaviorsettingswidget.h

Incremented year in copyright info

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

behaviorsettingswidget.ui

Editor help tool tip options cleanup.

2012-03-07 14:36:46 +01:00

circularclipboard.cpp

Incremented year in copyright info

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

circularclipboard.h

Incremented year in copyright info

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

circularclipboardassist.cpp

Incremented year in copyright info

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

circularclipboardassist.h

Incremented year in copyright info

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

codecselector.cpp

Incremented year in copyright info

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

codecselector.h

Incremented year in copyright info

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

codestyleeditor.cpp

Incremented year in copyright info

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

codestyleeditor.h

Incremented year in copyright info

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

codestylepool.cpp

Fix Krazy warnings about QString::null/clear().

2013-03-11 14:41:03 +01:00

codestylepool.h

Incremented year in copyright info

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

codestyleselectorwidget.cpp

Fix Krazy warnings about QString::null/clear().

2013-03-11 14:41:03 +01:00

codestyleselectorwidget.h

Incremented year in copyright info

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

codestyleselectorwidget.ui

UI files: Do not polute the global Ui namespace

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

colorscheme.cpp

Incremented year in copyright info

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

colorscheme.h

Incremented year in copyright info

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

colorschemeedit.cpp

Merge remote-tracking branch 'origin/2.6'

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

colorschemeedit.h

Incremented year in copyright info

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

colorschemeedit.ui

Fix editor color scheme

2010-08-06 12:59:18 +02:00

completionsettings.cpp

Incremented year in copyright info

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

completionsettings.h

Incremented year in copyright info

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

convenience.cpp

Incremented year in copyright info

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

convenience.h

Fix Krazy warnings about includes/header guards in Text Editor.

2013-03-12 16:18:53 +01:00

displaysettings.cpp

Editor: Refactor Open Link in Next Split.

2013-02-14 09:46:16 +01:00

displaysettings.h

Merge remote-tracking branch 'origin/2.6'

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

displaysettingspage.cpp

Editor: Refactor Open Link in Next Split.

2013-02-14 09:46:16 +01:00

displaysettingspage.h

Editor: Refactor Open Link in Next Split.

2013-02-14 09:46:16 +01:00

displaysettingspage.ui

Editor: Refactor Open Link in Next Split.

2013-02-14 09:46:16 +01:00

extraencodingsettings.cpp

Incremented year in copyright info

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

extraencodingsettings.h

Incremented year in copyright info

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

findincurrentfile.cpp

Incremented year in copyright info

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

findincurrentfile.h

Incremented year in copyright info

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

findinfiles.cpp

Incremented year in copyright info

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

findinfiles.h

Incremented year in copyright info

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

findinopenfiles.cpp

Incremented year in copyright info

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

findinopenfiles.h

Incremented year in copyright info

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

fontsettings.cpp

Merge remote-tracking branch 'origin/2.6'

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

fontsettings.h

Merge remote-tracking branch 'origin/2.6'

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

fontsettingspage.cpp

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

fontsettingspage.h

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

fontsettingspage.ui

Revert "Make our options dialog a bit more uniform"

2011-02-28 14:37:27 +01:00

helpitem.cpp

Incremented year in copyright info

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

helpitem.h

Incremented year in copyright info

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

icodestylepreferences.cpp

Merge remote-tracking branch 'origin/2.6'

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

icodestylepreferences.h

Incremented year in copyright info

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

icodestylepreferencesfactory.cpp

Incremented year in copyright info

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

icodestylepreferencesfactory.h

Merge remote-tracking branch 'origin/2.6'

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

indenter.cpp

Incremented year in copyright info

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

indenter.h

Incremented year in copyright info

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

ioutlinewidget.h

Incremented year in copyright info

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

itexteditor.cpp

Incremented year in copyright info

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

itexteditor.h

CPP, QmlJs editors: don't indent when moving commented lines up/down.

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

itextmark.cpp

Merge remote-tracking branch 'origin/2.6'

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

itextmark.h

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

linenumberfilter.cpp

Merge remote-tracking branch 'origin/2.6'

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

linenumberfilter.h

Merge remote-tracking branch 'origin/2.6'

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

normalindenter.cpp

Incremented year in copyright info

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

normalindenter.h

Incremented year in copyright info

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

outlinefactory.cpp

Merge remote-tracking branch 'origin/2.6'

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

outlinefactory.h

Incremented year in copyright info

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

plaintexteditor.cpp

PlainTextEditor: Use info suppression for syntax highlighting

2013-02-08 13:04:54 +01:00

plaintexteditor.h

PlainTextEditor: Use info suppression for syntax highlighting

2013-02-08 13:04:54 +01:00

plaintexteditorfactory.cpp

Fix Krazy warnings about includes/header guards in Text Editor.

2013-03-12 16:18:53 +01:00

plaintexteditorfactory.h

Incremented year in copyright info

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

quickfix.cpp

Incremented year in copyright info

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

quickfix.h

Merge remote-tracking branch 'origin/2.6'

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

refactoringchanges.cpp

Fix some Krazy warnings about non-const ref iterator.

2013-03-11 17:31:07 +01:00

refactoringchanges.h

Incremented year in copyright info

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

refactoroverlay.cpp

Merge remote-tracking branch 'origin/2.6'

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

refactoroverlay.h

Incremented year in copyright info

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

semantichighlighter.cpp

C++: optimize the semantic highlighting in the UI thread.

2013-02-26 16:25:34 +01:00

semantichighlighter.h

C++: Fix semantic highlighter and tests.

2013-03-04 13:16:50 +01:00

simplecodestylepreferences.cpp

Incremented year in copyright info

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

simplecodestylepreferences.h

Incremented year in copyright info

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

simplecodestylepreferenceswidget.cpp

Incremented year in copyright info

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

simplecodestylepreferenceswidget.h

Incremented year in copyright info

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

storagesettings.cpp

Merge remote-tracking branch 'origin/2.6'

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

storagesettings.h

Incremented year in copyright info

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

syntaxhighlighter.cpp

C++: optimize the semantic highlighting in the UI thread.

2013-02-26 16:25:34 +01:00

syntaxhighlighter.h

C++: optimize the semantic highlighting in the UI thread.

2013-02-26 16:25:34 +01:00

tabsettings.cpp

Remove call that has no effect and triggers crash in Qt later on.

2013-03-04 10:33:43 +01:00

tabsettings.h

Incremented year in copyright info

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

tabsettingswidget.cpp

Incremented year in copyright info

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

tabsettingswidget.h

Incremented year in copyright info

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

tabsettingswidget.ui

UI files: Do not polute the global Ui namespace

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

texteditor_dependencies.pri

Rename pro and pri files

2009-10-16 11:50:38 +02:00

texteditor_global.h

Incremented year in copyright info

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

TextEditor.mimetypes.xml

Fix opening of xml files.

2013-03-12 09:05:57 +01:00

TextEditor.pluginspec.in

Incremented year in copyright info

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

texteditor.pri

Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget.

2010-11-01 14:55:37 +01:00

texteditor.pro

Generalize QT_NO_CAST_FROM_ASCII

2013-01-16 01:14:08 +01:00

texteditor.qbs

Fix tests compilation

2013-03-05 09:01:18 +01:00

texteditor.qrc

TextEditor: Fix incorrect dependency to CppEditor resources

2012-01-30 14:06:23 +01:00

texteditoractionhandler.cpp

UI text: fix caps in CPP plugin actions

2013-02-15 15:20:37 +01:00

texteditoractionhandler.h

Editor: Refactor Open Link in Next Split.

2013-02-14 09:46:16 +01:00

texteditorconstants.cpp

Incremented year in copyright info

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

texteditorconstants.h

Editor: Refactor Open Link in Next Split.

2013-02-14 09:46:16 +01:00

texteditoroptionspage.cpp

Merge remote-tracking branch 'origin/2.6'

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

texteditoroptionspage.h

Incremented year in copyright info

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

texteditoroverlay.cpp

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

texteditoroverlay.h

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

texteditorplugin.cpp

Make variable manager static.

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

texteditorplugin.h

Incremented year in copyright info

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

texteditorsettings.cpp

Avoid crash on qmljs plugin unload

2013-03-12 16:22:12 +01:00

texteditorsettings.h

Avoid crash on qmljs plugin unload

2013-03-12 16:22:12 +01:00

textfilewizard.cpp

Incremented year in copyright info

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

textfilewizard.h

Incremented year in copyright info

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

typingsettings.cpp

Incremented year in copyright info

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

typingsettings.h

Incremented year in copyright info

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