Skip to content

GitLab

Commit 8261498c authored by dt's avatar dt
Browse files

Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1

parents 0dc21f42 de6a0cfe
Hide whitespace changes
Inline Side-by-side
doc/qtcreator.qdoc
View file @ 8261498c
......@@ -5,7 +5,7 @@
\title Qt Creator Manual
\section1 Version 1.0.80
\section1 Version 1.0.90
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
......@@ -76,7 +76,7 @@
\o \l{Keyboard Shortcuts}
\o \l{Glossary}
\o \l{Supported Platforms}
\o \l{Known Issues of Version 1.0.80}
\o \l{Known Issues of Version 1.0.90}
\o \l{Acknowledgements}
\endlist
......@@ -1572,9 +1572,9 @@
\page creator-known-issues.html
\nextpage creator-acknowledgements.html
\title Known Issues of Version 1.0.80
\title Known Issues of Version 1.0.90
There are some known issues with Qt Creator 1.0.80.
There are some known issues with Qt Creator 1.0.90.
The development team is aware of those, there is no need to report them as bug.
\list
......
doc/qtcreator.qdocconf
View file @ 8261498c
......@@ -18,15 +18,15 @@ sources.fileextensions = "qtcreator.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
qhp.QtCreator.namespace = com.nokia.qtcreator.1080
qhp.QtCreator.namespace = com.nokia.qtcreator.1090
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png
qhp.QtCreator.filterAttributes = qtcreator 1.0.80
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.80
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.80
qhp.QtCreator.filterAttributes = qtcreator 1.0.90
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.90
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.90
# macros.qdocconf
......@@ -202,5 +202,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia</td>\n" \
"<td width=\"40%\" align=\"center\">&nbsp;</td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.0.80</div></td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.0.90</div></td>\n" \
"</tr></table></div></address>"
scripts/replaceVersion.sh
View file @ 8261498c
......@@ -16,14 +16,14 @@ fi
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_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_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_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}"
......
share/qtcreator/Info.plist
View file @ 8261498c
......@@ -182,8 +182,8 @@
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator</string>
<key>CFBundleVersion</key>
<string>1.0.80</string>
<string>1.0.90</string>
<key>CFBundleShortVersionString</key>
<string>1.0.80</string>
<string>1.0.90</string>
</dict>
</plist>
src/plugins/bineditor/BinEditor.pluginspec
View file @ 8261498c
<plugin name="BinEditor" version="1.0.80" compatVersion="1.0.80">
<plugin name="BinEditor" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Binary editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/bookmarks/Bookmarks.pluginspec
View file @ 8261498c
<plugin name="Bookmarks" version="1.0.80" compatVersion="1.0.80">
<plugin name="Bookmarks" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Bookmarks in text editors.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
View file @ 8261498c
<plugin name="CMakeProjectManager" version="1.0.80" compatVersion="1.0.80">
<plugin name="CMakeProjectManager" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>CMake support</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="Help" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="CppTools" version="1.0.90"/>
<dependency name="CppEditor" version="1.0.90"/>
<dependency name="Help" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/coreplugin/Core.pluginspec
View file @ 8261498c
<plugin name="Core" version="1.0.80" compatVersion="1.0.80">
<plugin name="Core" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......
src/plugins/coreplugin/coreconstants.h
View file @ 8261498c
......@@ -35,7 +35,7 @@ namespace Constants {
#define IDE_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 0
#define IDE_VERSION_RELEASE 80
#define IDE_VERSION_RELEASE 90
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
......
src/plugins/cpaster/CodePaster.pluginspec
View file @ 8261498c
<plugin name="CodePaster" version="1.0.80" compatVersion="1.0.80">
<plugin name="CodePaster" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Codepaster plugin for pushing/fetching diff from server</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/cppeditor/CppEditor.pluginspec
View file @ 8261498c
<plugin name="CppEditor" version="1.0.80" compatVersion="1.0.80">
<plugin name="CppEditor" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>C/C++ editor component.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="CppTools" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/cpptools/CppTools.pluginspec
View file @ 8261498c
<plugin name="CppTools" version="1.0.80" compatVersion="1.0.80">
<plugin name="CppTools" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Tools for analyzing C/C++ code.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="QuickOpen" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="QuickOpen" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/debugger/Debugger.pluginspec
View file @ 8261498c
<plugin name="Debugger" version="1.0.80" compatVersion="1.0.80">
<plugin name="Debugger" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Debugger integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.0.80"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="Find" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.90"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="Find" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/designer/Designer.pluginspec
View file @ 8261498c
<plugin name="Designer" version="1.0.80" compatVersion="1.0.80">
<plugin name="Designer" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Qt Designer integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<!-- For compiling with CPP support enabled -->
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/fakevim/FakeVim.pluginspec
View file @ 8261498c
<plugin name="FakeVim" version="1.0.80" compatVersion="1.0.80">
<plugin name="FakeVim" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>VI-style keyboard navigation.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.0.80"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.90"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/find/Find.pluginspec
View file @ 8261498c
<plugin name="Find" version="1.0.80" compatVersion="1.0.80">
<plugin name="Find" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Provides the find widget and the hooks for find implementations.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
View file @ 8261498c
<plugin name="GenericProjectManager" version="1.0.80" compatVersion="1.0.80">
<plugin name="GenericProjectManager" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Generic support</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="CppTools" version="1.0.80"/>
<dependency name="CppEditor" version="1.0.80"/>
<dependency name="Help" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="CppTools" version="1.0.90"/>
<dependency name="CppEditor" version="1.0.90"/>
<dependency name="Help" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/git/ScmGit.pluginspec
View file @ 8261498c
<plugin name="ScmGit" version="1.0.80" compatVersion="1.0.80">
<plugin name="ScmGit" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Git integration.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.0.80"/>
<dependency name="ProjectExplorer" version="1.0.80"/>
<dependency name="Core" version="1.0.80"/>
<dependency name="VCSBase" version="1.0.80"/>
<dependency name="TextEditor" version="1.0.90"/>
<dependency name="ProjectExplorer" version="1.0.90"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="VCSBase" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/helloworld/HelloWorld.pluginspec
View file @ 8261498c
<plugin name="HelloWorld" version="1.0.80" compatVersion="1.0.80">
<plugin name="HelloWorld" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Hello World sample plugin.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
</dependencyList>
</plugin>
src/plugins/help/Help.pluginspec
View file @ 8261498c
<plugin name="Help" version="1.0.80" compatVersion="1.0.80">
<plugin name="Help" version="1.0.90" compatVersion="1.0.90">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Help system.</description>
<url>http://www.qtsoftware.com</url>
<dependencyList>
<dependency name="Core" version="1.0.80"/>
<dependency name="Find" version="1.0.80"/>
<dependency name="QuickOpen" version="1.0.80"/>
<dependency name="Core" version="1.0.90"/>
<dependency name="Find" version="1.0.90"/>
<dependency name="QuickOpen" version="1.0.90"/>
</dependencyList>
</plugin>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment