diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-31 16:25:33 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-31 16:25:33 +0100 |
| commit | 1fda2111d468a08b72894e0dbc63dfec46f97ab8 (patch) | |
| tree | 79580a2a7bb72a0b0c5dd0afb2c7b3c0eec8bdbb /src/plugins/macros | |
| parent | 893b3da55d998fb76322768e890d29c46fd6b33d (diff) | |
| parent | c0fe6211277b83e8ea26a9cf6f193836f41ab462 (diff) | |
| download | qt-creator-1fda2111d468a08b72894e0dbc63dfec46f97ab8.tar.gz | |
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
Diffstat (limited to 'src/plugins/macros')
29 files changed, 29 insertions, 29 deletions
diff --git a/src/plugins/macros/Macros.pluginspec.in b/src/plugins/macros/Macros.pluginspec.in index 709a2ab18b..80e5415b16 100644 --- a/src/plugins/macros/Macros.pluginspec.in +++ b/src/plugins/macros/Macros.pluginspec.in @@ -1,6 +1,6 @@ <plugin name=\"Macros\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\"> <vendor>Digia Plc</vendor> - <copyright>(C) 2012 Nicolas Arnaud-Cormos</copyright> + <copyright>(C) 2013 Nicolas Arnaud-Cormos</copyright> <license> Commercial Usage diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp index 8a38301dc7..da2bb4e1bd 100644 --- a/src/plugins/macros/actionmacrohandler.cpp +++ b/src/plugins/macros/actionmacrohandler.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h index 02db0fda63..d89863ee20 100644 --- a/src/plugins/macros/actionmacrohandler.h +++ b/src/plugins/macros/actionmacrohandler.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/findmacrohandler.cpp b/src/plugins/macros/findmacrohandler.cpp index 608dff943c..403fc966e1 100644 --- a/src/plugins/macros/findmacrohandler.cpp +++ b/src/plugins/macros/findmacrohandler.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/findmacrohandler.h b/src/plugins/macros/findmacrohandler.h index ce2ceda678..a7dcdd6522 100644 --- a/src/plugins/macros/findmacrohandler.h +++ b/src/plugins/macros/findmacrohandler.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/imacrohandler.cpp b/src/plugins/macros/imacrohandler.cpp index 46f8572d0b..51b7c02642 100644 --- a/src/plugins/macros/imacrohandler.cpp +++ b/src/plugins/macros/imacrohandler.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/imacrohandler.h b/src/plugins/macros/imacrohandler.h index fda81c2d6e..3b2e665b96 100644 --- a/src/plugins/macros/imacrohandler.h +++ b/src/plugins/macros/imacrohandler.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp index a552d1e218..91a8008afc 100644 --- a/src/plugins/macros/macro.cpp +++ b/src/plugins/macros/macro.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macro.h b/src/plugins/macros/macro.h index 96e95691a3..e1947f1b09 100644 --- a/src/plugins/macros/macro.h +++ b/src/plugins/macros/macro.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp index acdc1ccd05..59f9a7ac53 100644 --- a/src/plugins/macros/macroevent.cpp +++ b/src/plugins/macros/macroevent.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h index 263edb4e09..9345f89dbe 100644 --- a/src/plugins/macros/macroevent.h +++ b/src/plugins/macros/macroevent.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index 2a24f08716..2d4d72386f 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h index aeb1094b69..e3efd66a39 100644 --- a/src/plugins/macros/macrolocatorfilter.h +++ b/src/plugins/macros/macrolocatorfilter.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 5dc19cb88a..63a623038b 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h index 95e6f4c6e3..045d140bc5 100644 --- a/src/plugins/macros/macromanager.h +++ b/src/plugins/macros/macromanager.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp index 04f3ea8507..97220d054c 100644 --- a/src/plugins/macros/macrooptionspage.cpp +++ b/src/plugins/macros/macrooptionspage.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrooptionspage.h b/src/plugins/macros/macrooptionspage.h index 17b8783bb1..6e9f8ea1bf 100644 --- a/src/plugins/macros/macrooptionspage.h +++ b/src/plugins/macros/macrooptionspage.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 31847a1974..7c8106e6f5 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h index deba7ccb6d..234cd165e5 100644 --- a/src/plugins/macros/macrooptionswidget.h +++ b/src/plugins/macros/macrooptionswidget.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macros_global.h b/src/plugins/macros/macros_global.h index 39af56383c..397a070fca 100644 --- a/src/plugins/macros/macros_global.h +++ b/src/plugins/macros/macros_global.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrosconstants.h b/src/plugins/macros/macrosconstants.h index 08da00a294..2807af62ca 100644 --- a/src/plugins/macros/macrosconstants.h +++ b/src/plugins/macros/macrosconstants.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp index c04bb2a998..b31aa2f559 100644 --- a/src/plugins/macros/macrosplugin.cpp +++ b/src/plugins/macros/macrosplugin.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrosplugin.h b/src/plugins/macros/macrosplugin.h index a9d6b94ac0..4617dfdb90 100644 --- a/src/plugins/macros/macrosplugin.h +++ b/src/plugins/macros/macrosplugin.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrotextfind.cpp b/src/plugins/macros/macrotextfind.cpp index 6eb66f3fd1..ab14dc5076 100644 --- a/src/plugins/macros/macrotextfind.cpp +++ b/src/plugins/macros/macrotextfind.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/macrotextfind.h b/src/plugins/macros/macrotextfind.h index 4a1ff2c5f9..cedcfa355e 100644 --- a/src/plugins/macros/macrotextfind.h +++ b/src/plugins/macros/macrotextfind.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/savedialog.cpp b/src/plugins/macros/savedialog.cpp index ff13901c9c..2f79efa09e 100644 --- a/src/plugins/macros/savedialog.cpp +++ b/src/plugins/macros/savedialog.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h index bdc9a8532b..bc89ed3928 100644 --- a/src/plugins/macros/savedialog.h +++ b/src/plugins/macros/savedialog.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index 0ce5828458..7e6e4f0eec 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. diff --git a/src/plugins/macros/texteditormacrohandler.h b/src/plugins/macros/texteditormacrohandler.h index 64dd40d553..02d50688c3 100644 --- a/src/plugins/macros/texteditormacrohandler.h +++ b/src/plugins/macros/texteditormacrohandler.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (c) 2012 Nicolas Arnaud-Cormos +** Copyright (c) 2013 Nicolas Arnaud-Cormos ** Contact: http://www.qt-project.org/legal ** ** This file is part of Qt Creator. |