diff --git a/README b/README index dc985a834c3..ea0c882dff7 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Qt Creator 2.1.81 -=============== +Qt Creator +========== Qt Creator is a crossplatform C++ IDE for development with the Qt framework. Supported Platforms diff --git a/doc/doc.pri b/doc/doc.pri index 8cf07f2c35b..cf433f09874 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,14 +1,18 @@ QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) +VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", ) + equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys - QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN + QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN } else:win32-g++* { # just mingw # The lack of spaces in front of the && is necessary! - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN + QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QTC_VERSION=$$QTCREATOR_VERSION&& set QTC_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN } else { # nmake QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \ set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \ + set QTC_VERSION=$$QTCREATOR_VERSION $$escape_expand(\\n\\t) \ + set QTC_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \ $$QDOC_BIN } diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 2082a077e77..f43c1b6cfa7 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -39,7 +39,7 @@ \title Qt Creator Manual - \section1 Version 2.1.81 + \section1 Version \qtcversion Qt Creator provides a cross-platform, complete integrated development environment (IDE) for application developers to create applications for diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 6672a40903c..9e8df7cefaa 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -20,12 +20,12 @@ sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressb qhp.projects = QtCreator qhp.QtCreator.file = qtcreator.qhp -qhp.QtCreator.namespace = com.nokia.qtcreator.2181 +qhp.QtCreator.namespace = com.nokia.qtcreator.$QTC_VERSION_TAG qhp.QtCreator.virtualFolder = doc qhp.QtCreator.indexTitle = Qt Creator -qhp.QtCreator.filterAttributes = qtcreator 2.1.81 -qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.1.81 -qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.1.81 +qhp.QtCreator.filterAttributes = qtcreator $QTC_VERSION +qhp.QtCreator.customFilters.QtCreator.name = Qt Creator $QTC_VERSION +qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator $QTC_VERSION qhp.QtCreator.indexRoot = qhp.QtCreator.extraFiles = style/style.css \ style/style_ie6.css \ @@ -66,6 +66,8 @@ qhp.QtCreator.subprojects.manual.type = manual # macros.qdocconf +macro.qtcversion = $QTC_VERSION + macro.aring.HTML = "å" macro.Auml.HTML = "Ä" macro.author = "\\bold{Author:}" diff --git a/qtcreator.pri b/qtcreator.pri index f1a9f6af50e..01175dbe590 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,6 +1,8 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 +QTCREATOR_VERSION = 2.1.81 + defineReplace(cleanPath) { win32:1 ~= s|\\\\|/|g contains(1, ^/.*):pfx = / diff --git a/scripts/replaceVersion.sh b/scripts/replaceVersion.sh deleted file mode 100755 index 0e7dc87ebe1..00000000000 --- a/scripts/replaceVersion.sh +++ /dev/null @@ -1,138 +0,0 @@ -#! /usr/bin/env bash - -## Command line parameters -if [[ $# != 2 ]]; then - cat < -example: - $0 '1.2.3' '1.2.4' -USAGE - exit 1 -fi - - -## Process and show version -OLD=`sed 's/\./\\\\./g' <<<"$1"` -NEW=`sed 's/\./\\\\./g' <<<"$2"` - -OLD_MAJOR=`sed 's/^\([0-9]*\)\.[0-9]*\.[0-9]*/\1/' <<<"$1"` -NEW_MAJOR=`sed 's/^\([0-9]*\)\.[0-9]*\.[0-9]*/\1/' <<<"$2"` - -OLD_MINOR=`sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*/\1/' <<<"$1"` -NEW_MINOR=`sed 's/^[0-9]*\.\([0-9]*\)\.[0-9]*/\1/' <<<"$2"` - -OLD_RELEASE=`sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\)/\1/' <<<"$1"` -NEW_RELEASE=`sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\)/\1/' <<<"$2"` - -OLD_THREE="${OLD_MAJOR}${OLD_MINOR}${OLD_RELEASE}" -NEW_THREE="${NEW_MAJOR}${NEW_MINOR}${NEW_RELEASE}" - -OLD_DOT_THREE="${OLD_MAJOR}\\.${OLD_MINOR}\\.${OLD_RELEASE}" -NEW_DOT_THREE="${NEW_MAJOR}\\.${NEW_MINOR}\\.${NEW_RELEASE}" - -OLD_DOT_FOUR="${OLD_MAJOR}\\.${OLD_MINOR}\\.${OLD_RELEASE}\\.0" -NEW_DOT_FOUR="${NEW_MAJOR}\\.${NEW_MINOR}\\.${NEW_RELEASE}\\.0" - -OLD_COMMA_FOUR="${OLD_MAJOR},${OLD_MINOR},${OLD_RELEASE},0" -NEW_COMMA_FOUR="${NEW_MAJOR},${NEW_MINOR},${NEW_RELEASE},0" - -echo "#===============================================" -echo "# Plain '${OLD}' -> '${NEW}'" -echo "#-----------------------------------------------" -echo "# Major '${OLD_MAJOR}' -> '${NEW_MAJOR}'" -echo "# Minor '${OLD_MINOR}' -> '${NEW_MINOR}'" -echo "# Release '${OLD_RELEASE}' -> '${NEW_RELEASE}'" -echo "#-----------------------------------------------" -echo "# 3 '${OLD_THREE}' -> '${NEW_THREE}'" -echo "# Dot 3 '${OLD_DOT_THREE}' -> '${NEW_DOT_THREE}'" -echo "# Dot 4 '${OLD_DOT_FOUR}' -> '${NEW_DOT_FOUR}'" -echo "# Comma 4 '${OLD_COMMA_FOUR}' -> '${NEW_COMMA_FOUR}'" -echo "#===============================================" -echo - - -## Make script safe to call from anywhere by going home first -SCRIPT_DIR=`dirname "${PWD}/$0"`/.. -echo "Entering directory \`${SCRIPT_DIR}'" -pushd "${SCRIPT_DIR}" &>/dev/null || exit 1 - - -## Patch *.pluginspec -while read i ; do - echo "Patching \`$i'" - TMPFILE=`mktemp versionPatch.XXXXXX` - sed -e 's/version="'"${OLD}"'"/version="'"${NEW}"'"/' \ - -e 's/compatVersion="'"${OLD}"'"/compatVersion="'"${NEW}"'"/' \ - "${i}" > "${TMPFILE}" - mv -f "${TMPFILE}" "${i}" -done < <(find . -name '*.pluginspec') - - -## Patch coreconstants.h -TMPFILE=`mktemp versionPatch.XXXXXX` -CORE_CONSTANT_H="${SCRIPT_DIR}/src/plugins/coreplugin/coreconstants.h" -echo "Patching \`${CORE_CONSTANT_H}'" -sed \ - -e 's/^\(#define IDE_VERSION_MAJOR \)'"${OLD_MAJOR}"'/\1'"${NEW_MAJOR}"'/' \ - -e 's/^\(#define IDE_VERSION_MINOR \)'"${OLD_MINOR}"'/\1'"${NEW_MINOR}"'/' \ - -e 's/^\(#define IDE_VERSION_RELEASE \)'"${OLD_RELEASE}"'/\1'"${NEW_RELEASE}"'/' \ - "${CORE_CONSTANT_H}" > "${TMPFILE}" -mv -f "${TMPFILE}" "${CORE_CONSTANT_H}" - - -## Patch Info.plist -TMPFILE=`mktemp versionPatch.XXXXXX` -INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist" -echo "Patching \`${INFO_PLIST}'" -sed \ - -e "s/"${OLD}"/"${NEW}"/" \ - "${INFO_PLIST}" > "${TMPFILE}" -mv -f "${TMPFILE}" "${INFO_PLIST}" - - -## Patch qtcreator.qdocconf -TMPFILE=`mktemp versionPatch.XXXXXX` -QDOCCONF="${SCRIPT_DIR}/doc/qtcreator.qdocconf" -echo "Patching \`${QDOCCONF}'" -sed \ - -e "s/"${OLD_DOT_THREE}"/"${NEW_DOT_THREE}"/" \ - -e "s/"${OLD_THREE}"/"${NEW_THREE}"/" \ - "${QDOCCONF}" > "${TMPFILE}" -mv -f "${TMPFILE}" "${QDOCCONF}" - -## Patch qt-html-templates.qdocconf -TMPFILE=`mktemp versionPatch.XXXXXX` -QDOCCONF="${SCRIPT_DIR}/doc/qt-html-templates.qdocconf" -echo "Patching \`${QDOCCONF}'" -sed \ - -e "s/"${OLD_DOT_THREE}"/"${NEW_DOT_THREE}"/" \ - -e "s/"${OLD_THREE}"/"${NEW_THREE}"/" \ - "${QDOCCONF}" > "${TMPFILE}" -mv -f "${TMPFILE}" "${QDOCCONF}" - - -## Patch qtcreator.qdoc -TMPFILE=`mktemp versionPatch.XXXXXX` -QDOC="${SCRIPT_DIR}/doc/qtcreator.qdoc" -echo "Patching \`${QDOC}'" -sed \ - -e 's/'${OLD_DOT_THREE}'/'${NEW_DOT_THREE}'/' \ - "${QDOC}" > "${TMPFILE}" -mv -f "${TMPFILE}" "${QDOC}" - - -## Patch README -TMPFILE=`mktemp versionPatch.XXXXXX` -README="${SCRIPT_DIR}/README" -echo "Patching \`${README}'" -sed \ - -e 's/'${OLD_DOT_THREE}'/'${NEW_DOT_THREE}'/' \ - "${README}" > "${TMPFILE}" -mv -f "${TMPFILE}" "${README}" - - -## Go back to original $PWD -echo "Leaving directory \`${SCRIPT_DIR}'" -popd &>/dev/null || exit 1 -exit 0 diff --git a/src/app/Info.plist b/src/app/Info.plist.in similarity index 98% rename from src/app/Info.plist rename to src/app/Info.plist.in index ce122da3a21..589a77e8c24 100644 --- a/src/app/Info.plist +++ b/src/app/Info.plist.in @@ -212,8 +212,8 @@ CFBundleIdentifier com.nokia.qtcreator CFBundleVersion - 2.1.81 + $$QTCREATOR_VERSION CFBundleShortVersionString - 2.1.81 + $$QTCREATOR_VERSION diff --git a/src/app/app.pro b/src/app/app.pro index f86433d6af5..8c856d7ed4b 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -31,4 +31,6 @@ win32 { INSTALLS += target } -OTHER_FILES += qtcreator.rc Info.plist +OTHER_FILES += qtcreator.rc Info.plist.in + +QMAKE_SUBSTITUTES = Info.plist.in diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec.in similarity index 79% rename from src/plugins/bineditor/BinEditor.pluginspec rename to src/plugins/bineditor/BinEditor.pluginspec.in index 0755010e756..c6d211c956d 100644 --- a/src/plugins/bineditor/BinEditor.pluginspec +++ b/src/plugins/bineditor/BinEditor.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,7 +14,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Binary editor component. http://qt.nokia.com - - + + diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec.in similarity index 74% rename from src/plugins/bookmarks/Bookmarks.pluginspec rename to src/plugins/bookmarks/Bookmarks.pluginspec.in index 9c659c274b6..1d62cd75547 100644 --- a/src/plugins/bookmarks/Bookmarks.pluginspec +++ b/src/plugins/bookmarks/Bookmarks.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Bookmarks in text editors. http://qt.nokia.com - - - + + + diff --git a/src/plugins/classview/ClassView.pluginspec b/src/plugins/classview/ClassView.pluginspec.in similarity index 70% rename from src/plugins/classview/ClassView.pluginspec rename to src/plugins/classview/ClassView.pluginspec.in index 77f76573948..1eab2b9ab49 100644 --- a/src/plugins/classview/ClassView.pluginspec +++ b/src/plugins/classview/ClassView.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Denis Mingulov @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Class View component. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in similarity index 69% rename from src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec rename to src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in index 2719a920a5f..325ab90e23b 100644 --- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec +++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General CMake support http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec.in similarity index 83% rename from src/plugins/coreplugin/Core.pluginspec rename to src/plugins/coreplugin/Core.pluginspec.in index 6ca42b8d805..64acea4e8ae 100644 --- a/src/plugins/coreplugin/Core.pluginspec +++ b/src/plugins/coreplugin/Core.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General The core plugin for the Qt IDE. http://qt.nokia.com - Override selected UI color + Override selected UI color diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index af2e8e44b4a..031b8ae8b65 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -35,9 +35,7 @@ namespace Core { namespace Constants { -#define IDE_VERSION_MAJOR 2 -#define IDE_VERSION_MINOR 1 -#define IDE_VERSION_RELEASE 81 +#include "ide_version.h" #define STRINGIFY_INTERNAL(x) #x #define STRINGIFY(x) STRINGIFY_INTERNAL(x) diff --git a/src/plugins/coreplugin/coreplugin.pri b/src/plugins/coreplugin/coreplugin.pri index 26143cbc129..eaff7803bb4 100644 --- a/src/plugins/coreplugin/coreplugin.pri +++ b/src/plugins/coreplugin/coreplugin.pri @@ -1,2 +1,5 @@ include(coreplugin_dependencies.pri) LIBS *= -l$$qtLibraryName(Core) +# for ide_version.h +INCLUDEPATH += $$IDE_BUILD_TREE/src/plugins/coreplugin +DEPENDPATH += $$IDE_BUILD_TREE/src/plugins/coreplugin diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 2bc24e65f38..711f8297e49 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -248,4 +248,6 @@ else:unix { images.path = /share/pixmaps INSTALLS += images } -OTHER_FILES += editormanager/BinFiles.mimetypes.xml +OTHER_FILES += editormanager/BinFiles.mimetypes.xml ide_version.h.in + +QMAKE_SUBSTITUTES += ide_version.h.in diff --git a/src/plugins/coreplugin/ide_version.h.in b/src/plugins/coreplugin/ide_version.h.in new file mode 100644 index 00000000000..2d28fac7dbe --- /dev/null +++ b/src/plugins/coreplugin/ide_version.h.in @@ -0,0 +1,32 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** Commercial Usage +** +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://qt.nokia.com/contact. +** +**************************************************************************/ + +#define IDE_VERSION_MAJOR $$replace(QTCREATOR_VERSION, "^(\\d+)\\.\\d+\\.\\d+(-.*)?$", \\1) +#define IDE_VERSION_MINOR $$replace(QTCREATOR_VERSION, "^\\d+\\.(\\d+)\\.\\d+(-.*)?$", \\1) +#define IDE_VERSION_RELEASE $$replace(QTCREATOR_VERSION, "^\\d+\\.\\d+\\.(\\d+)(-.*)?$", \\1) diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec.in similarity index 79% rename from src/plugins/cpaster/CodePaster.pluginspec rename to src/plugins/cpaster/CodePaster.pluginspec.in index 83acf7dd635..4fce7383326 100644 --- a/src/plugins/cpaster/CodePaster.pluginspec +++ b/src/plugins/cpaster/CodePaster.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,7 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Codepaster plugin for pushing/fetching diff from server http://qt.nokia.com - - + + diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec.in similarity index 75% rename from src/plugins/cppeditor/CppEditor.pluginspec rename to src/plugins/cppeditor/CppEditor.pluginspec.in index 9c2a2b1601c..bdb82452e8e 100644 --- a/src/plugins/cppeditor/CppEditor.pluginspec +++ b/src/plugins/cppeditor/CppEditor.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General C/C++ editor component. http://qt.nokia.com - - - + + + diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec.in similarity index 70% rename from src/plugins/cpptools/CppTools.pluginspec rename to src/plugins/cpptools/CppTools.pluginspec.in index b62c9e5dff1..704a64f4506 100644 --- a/src/plugins/cpptools/CppTools.pluginspec +++ b/src/plugins/cpptools/CppTools.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Tools for analyzing C/C++ code. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/cvs/CVS.pluginspec b/src/plugins/cvs/CVS.pluginspec.in similarity index 71% rename from src/plugins/cvs/CVS.pluginspec rename to src/plugins/cvs/CVS.pluginspec.in index 47e49e4686f..d2b35efbebe 100644 --- a/src/plugins/cvs/CVS.pluginspec +++ b/src/plugins/cvs/CVS.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General CVS integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec deleted file mode 100644 index d2050b61278..00000000000 --- a/src/plugins/debugger/Debugger.pluginspec +++ /dev/null @@ -1,30 +0,0 @@ - - Nokia Corporation - (C) 2010 Nokia Corporation - -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia. - -GNU Lesser General Public License Usage - -Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - - Qt Creator - Debugger integration. - http://qt.nokia.com - - - - - - - - Disable Cdb debugger engine - Disable Gdb debugger engine - Disable Qt Script debugger engine - Disable Tcf debugger engine - Attach to Process-Id or Core file - Event handle used for attaching to crashed processes - - diff --git a/src/plugins/debugger/Debugger.pluginspec.in b/src/plugins/debugger/Debugger.pluginspec.in new file mode 100644 index 00000000000..565da29a394 --- /dev/null +++ b/src/plugins/debugger/Debugger.pluginspec.in @@ -0,0 +1,30 @@ + + Nokia Corporation + (C) 2010 Nokia Corporation + +Commercial Usage + +Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia. + +GNU Lesser General Public License Usage + +Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + + Qt Creator + Debugger integration. + http://qt.nokia.com + + + + + + + + Disable Cdb debugger engine + Disable Gdb debugger engine + Disable Qt Script debugger engine + Disable Tcf debugger engine + Attach to Process-Id or Core file + Event handle used for attaching to crashed processes + + diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec.in similarity index 76% rename from src/plugins/designer/Designer.pluginspec rename to src/plugins/designer/Designer.pluginspec.in index 3f6e81ea869..e917a2e81a3 100644 --- a/src/plugins/designer/Designer.pluginspec +++ b/src/plugins/designer/Designer.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Qt Designer integration. http://qt.nokia.com - + - - + + diff --git a/src/plugins/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec.in similarity index 67% rename from src/plugins/fakevim/FakeVim.pluginspec rename to src/plugins/fakevim/FakeVim.pluginspec.in index d68f79f5090..3a3570a484d 100644 --- a/src/plugins/fakevim/FakeVim.pluginspec +++ b/src/plugins/fakevim/FakeVim.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,9 +13,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General VI-style keyboard navigation. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec.in similarity index 86% rename from src/plugins/find/Find.pluginspec rename to src/plugins/find/Find.pluginspec.in index d9263df3f60..7fb4144b438 100644 --- a/src/plugins/find/Find.pluginspec +++ b/src/plugins/find/Find.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Provides the find widget and the hooks for find implementations. http://qt.nokia.com - + diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in similarity index 73% rename from src/plugins/genericprojectmanager/GenericProjectManager.pluginspec rename to src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in index 89808c9a922..3b77ffeba72 100644 --- a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec +++ b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Generic support http://qt.nokia.com - - - + + + diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec.in similarity index 71% rename from src/plugins/git/ScmGit.pluginspec rename to src/plugins/git/ScmGit.pluginspec.in index f1a87589de4..d81d4d47314 100644 --- a/src/plugins/git/ScmGit.pluginspec +++ b/src/plugins/git/ScmGit.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Git integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec.in similarity index 82% rename from src/plugins/helloworld/HelloWorld.pluginspec rename to src/plugins/helloworld/HelloWorld.pluginspec.in index f2b06679bd0..0bdabd0118b 100644 --- a/src/plugins/helloworld/HelloWorld.pluginspec +++ b/src/plugins/helloworld/HelloWorld.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,6 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Hello World sample plugin. http://qt.nokia.com - + diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec.in similarity index 75% rename from src/plugins/help/Help.pluginspec rename to src/plugins/help/Help.pluginspec.in index fc80949bf40..cbaaea2f52d 100644 --- a/src/plugins/help/Help.pluginspec +++ b/src/plugins/help/Help.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Help system. http://qt.nokia.com - - - + + + diff --git a/src/plugins/imageviewer/ImageViewer.pluginspec b/src/plugins/imageviewer/ImageViewer.pluginspec.in similarity index 84% rename from src/plugins/imageviewer/ImageViewer.pluginspec rename to src/plugins/imageviewer/ImageViewer.pluginspec.in index d4a01b07280..8cead354bed 100644 --- a/src/plugins/imageviewer/ImageViewer.pluginspec +++ b/src/plugins/imageviewer/ImageViewer.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Denis Mingulov @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Image Viewer component. http://qt.nokia.com - + diff --git a/src/plugins/locator/Locator.pluginspec b/src/plugins/locator/Locator.pluginspec.in similarity index 85% rename from src/plugins/locator/Locator.pluginspec rename to src/plugins/locator/Locator.pluginspec.in index 96ca3145d6b..d6a99570fb9 100644 --- a/src/plugins/locator/Locator.pluginspec +++ b/src/plugins/locator/Locator.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Provides the Locator widget and the hooks for Locator filter implementations. http://qt.nokia.com - + diff --git a/src/plugins/mercurial/Mercurial.pluginspec b/src/plugins/mercurial/Mercurial.pluginspec.in similarity index 71% rename from src/plugins/mercurial/Mercurial.pluginspec rename to src/plugins/mercurial/Mercurial.pluginspec.in index 473be1f4885..8ff246b0de4 100644 --- a/src/plugins/mercurial/Mercurial.pluginspec +++ b/src/plugins/mercurial/Mercurial.pluginspec.in @@ -1,4 +1,4 @@ - + Brian McGillion (C) 2008-2009 Brian McGillion @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Mercurial integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec.in similarity index 71% rename from src/plugins/perforce/Perforce.pluginspec rename to src/plugins/perforce/Perforce.pluginspec.in index 7229d18ce9a..7a48f433519 100644 --- a/src/plugins/perforce/Perforce.pluginspec +++ b/src/plugins/perforce/Perforce.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Perforce integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in similarity index 65% rename from src/plugins/projectexplorer/ProjectExplorer.pluginspec rename to src/plugins/projectexplorer/ProjectExplorer.pluginspec.in index dceb7753724..f51d62df107 100644 --- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec +++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,13 +14,13 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General ProjectExplorer framework that can be extended with different kind of project types. http://qt.nokia.com - - - - + + + + - Verbose loading of custom wizards - Restore the last session + Verbose loading of custom wizards + Restore the last session diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in similarity index 75% rename from src/plugins/qmldesigner/QmlDesigner.pluginspec rename to src/plugins/qmldesigner/QmlDesigner.pluginspec.in index b6a2cca6b73..1f6c9bfde09 100644 --- a/src/plugins/qmldesigner/QmlDesigner.pluginspec +++ b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -20,8 +20,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. Visual Designer for QML files. http://qt.nokia.com - - - + + + diff --git a/src/plugins/qmljseditor/QmlJSEditor.pluginspec b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in similarity index 74% rename from src/plugins/qmljseditor/QmlJSEditor.pluginspec rename to src/plugins/qmljseditor/QmlJSEditor.pluginspec.in index adc6a03345b..29c8c7ca3c0 100644 --- a/src/plugins/qmljseditor/QmlJSEditor.pluginspec +++ b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Editor for QML and JavaScript. http://qt.nokia.com - - - + + + diff --git a/src/plugins/qmljsinspector/QmlJSInspector.pluginspec b/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in similarity index 62% rename from src/plugins/qmljsinspector/QmlJSInspector.pluginspec rename to src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in index 712c90be5d1..8fe76be835e 100644 --- a/src/plugins/qmljsinspector/QmlJSInspector.pluginspec +++ b/src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -20,11 +20,11 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. Debugger for QML files http://qt.nokia.com - - - - - - + + + + + + diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in similarity index 65% rename from src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec rename to src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in index 8e7d1a909d2..249636e1fc3 100644 --- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec +++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,10 +14,10 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Qt Quick support http://qt.nokia.com - - - - - + + + + + diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in similarity index 67% rename from src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec rename to src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in index 6b0e5427957..3f03fb2b836 100644 --- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec +++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,10 +14,10 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Provides project type for Qt 4 pro files and tools. http://qt.nokia.com - - - - - + + + + + diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec.in similarity index 84% rename from src/plugins/regexp/RegExp.pluginspec rename to src/plugins/regexp/RegExp.pluginspec.in index d23b473d7ad..ff0059a677c 100644 --- a/src/plugins/regexp/RegExp.pluginspec +++ b/src/plugins/regexp/RegExp.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,6 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Regular Expression test widget. http://qt.nokia.com - + diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in similarity index 84% rename from src/plugins/resourceeditor/ResourceEditor.pluginspec rename to src/plugins/resourceeditor/ResourceEditor.pluginspec.in index e7ecf2eeda7..bdc02381f69 100644 --- a/src/plugins/resourceeditor/ResourceEditor.pluginspec +++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Editor for qrc files. http://qt.nokia.com - + diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec.in similarity index 70% rename from src/plugins/subversion/Subversion.pluginspec rename to src/plugins/subversion/Subversion.pluginspec.in index 67e1e264938..8058678064e 100644 --- a/src/plugins/subversion/Subversion.pluginspec +++ b/src/plugins/subversion/Subversion.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,9 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Subversion integration. http://qt.nokia.com - - - - + + + + diff --git a/src/plugins/tasklist/TaskList.pluginspec b/src/plugins/tasklist/TaskList.pluginspec.in similarity index 79% rename from src/plugins/tasklist/TaskList.pluginspec rename to src/plugins/tasklist/TaskList.pluginspec.in index b1a8eca3e4a..c266cc3a48a 100644 --- a/src/plugins/tasklist/TaskList.pluginspec +++ b/src/plugins/tasklist/TaskList.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -13,7 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Use .tasks-files to populate the build issues view. http://qt.nokia.com - - + + diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec.in similarity index 76% rename from src/plugins/texteditor/TextEditor.pluginspec rename to src/plugins/texteditor/TextEditor.pluginspec.in index 1670ce1ca40..5f5bb701037 100644 --- a/src/plugins/texteditor/TextEditor.pluginspec +++ b/src/plugins/texteditor/TextEditor.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Text editor framework and the implementation of the basic text editor. http://qt.nokia.com - - - + + + diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec.in similarity index 75% rename from src/plugins/vcsbase/VCSBase.pluginspec rename to src/plugins/vcsbase/VCSBase.pluginspec.in index ee142de6c03..16af539d2b5 100644 --- a/src/plugins/vcsbase/VCSBase.pluginspec +++ b/src/plugins/vcsbase/VCSBase.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,8 +14,8 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Version Control System Base Plugin http://qt.nokia.com - - - + + + diff --git a/src/plugins/welcome/Welcome.pluginspec b/src/plugins/welcome/Welcome.pluginspec.in similarity index 85% rename from src/plugins/welcome/Welcome.pluginspec rename to src/plugins/welcome/Welcome.pluginspec.in index 1b4c17425c2..092bb2f2639 100644 --- a/src/plugins/welcome/Welcome.pluginspec +++ b/src/plugins/welcome/Welcome.pluginspec.in @@ -1,4 +1,4 @@ - + Nokia Corporation (C) 2010 Nokia Corporation @@ -14,6 +14,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General Default Welcome Screen Plugin http://qt.nokia.com - + diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index fc7b40ef076..2b98eb9e3d2 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -17,17 +17,30 @@ isEmpty(TARGET) { error("qtcreatorplugin.pri: You must provide a TARGET") } -PLUGINSPECS = $${_PRO_FILE_PWD_}/$${TARGET}.pluginspec -copy2build.input = PLUGINSPECS -copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir} +defineReplace(stripOutDir) { + 1 ~= s|^$$re_escape($$OUT_PWD/)||$$i_flag + return($$1) +} + +PLUGINSPEC = $$_PRO_FILE_PWD_/$${TARGET}.pluginspec +PLUGINSPEC_IN = $${PLUGINSPEC}.in +exists($$PLUGINSPEC_IN) { + OTHER_FILES += $$PLUGINSPEC_IN + PLUGINSPEC = $$OUT_PWD/$${TARGET}.pluginspec + QMAKE_SUBSTITUTES += $${PLUGINSPEC}.in + copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripOutDir} +} else { + # need to support that for external plugins + OTHER_FILES += $$PLUGINSPEC + copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir} +} +copy2build.input = PLUGINSPEC isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} copy2build.CONFIG += no_link QMAKE_EXTRA_COMPILERS += copy2build -OTHER_FILES += $$PLUGINSPECS - macx { !isEmpty(TIGER_COMPAT_MODE) { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/