Merge branch '1.0.0' into master-master

Conflicts:
	src/plugins/debugger/debugger.pro
	src/plugins/debugger/gdbengine.cpp

doc/qtcreator.qdoc

@@ -5,13 +5,13 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 0.9.2 (Release Candidate)
+    \section1 Version 1.0.0
 
     The goal of Qt Creator is to provide a cross-platform, complete Integrated
     Development Environment (IDE) to develop Qt projects. It is available for
     the Linux, Mac OS X and Windows platforms.
 
-    \note The current version of Qt Creator is 0.9.2 (Release Candidate). It is
+    \note The current version of Qt Creator is 1.0.0 . It is
     possible to edit source code, compile, run and debug applications; other
     features are still under development. Please send bug reports and
     suggestions to qt-creator@trolltech.com. To subscribe, send a
@@ -59,7 +59,7 @@
        \o \l{Tips and Tricks}
        \o \l{Keyboard Shortcuts}
        \o \l{Glossary}
-       \o \l{Known Issues of Version 0.9.2 (Release Candidate)}
+       \o \l{Known Issues of Version 1.0.0}
     \endlist
 
 */
@@ -1420,9 +1420,9 @@
     \previouspage creator-keyboard-shortcuts.html
     \page creator-known-issues.html
 
-    \title Known Issues of Version 0.9.2 (Release Candidate)
+    \title Known Issues of Version 1.0.0
 
-    There are some known issues with Qt Creator 0.9.2 (Release Candidate).
+    There are some known issues with Qt Creator 1.0.0 .
     The development team is aware of those, there is no need to report them as bug.
 
     \list

doc/qtcreator.qdocconf

@@ -17,15 +17,15 @@ sources.fileextensions  = "qtcreator.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.092
+qhp.QtCreator.namespace        = com.nokia.qtcreator.100
 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 0.9.2
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 0.9.2
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 0.9.2
+qhp.QtCreator.filterAttributes = qtcreator 1.0.0
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.0
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.0
 
 # macros.qdocconf
 
@@ -201,5 +201,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; 2008 Nokia</td>\n" \
                           "<td width=\"40%\" align=\"center\">&nbsp;</td>\n" \
-                          "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 0.9.2</div></td>\n" \
+                          "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.0.0</div></td>\n" \
                           "</tr></table></div></address>"

replaceVersion.sh → scripts/replaceVersion.sh

@@ -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}"
@@ -53,7 +53,7 @@ echo
 
 
 ## Make script safe to call from anywhere by going home first
-SCRIPT_DIR=`dirname "${PWD}/$0"`
+SCRIPT_DIR=`dirname "${PWD}/$0"`/..
 echo "Entering directory \`${SCRIPT_DIR}'"
 pushd "${SCRIPT_DIR}" &>/dev/null || exit 1
 
@@ -61,7 +61,7 @@ pushd "${SCRIPT_DIR}" &>/dev/null || exit 1
 ## Patch *.pluginspec
 while read i ; do
     echo "Patching \`$i'"
-    TMPFILE=`mktemp`
+    TMPFILE=`mktemp versionPatch.XXXXXX`
     sed -e 's/version="'"${OLD}"'"/version="'"${NEW}"'"/' \
             -e 's/compatVersion="'"${OLD}"'"/compatVersion="'"${NEW}"'"/' \
             "${i}" > "${TMPFILE}"
@@ -70,7 +70,7 @@ done < <(find . -name '*.pluginspec')
 
 
 ## Patch coreconstants.h
-TMPFILE=`mktemp`
+TMPFILE=`mktemp versionPatch.XXXXXX`
 CORE_CONSTANT_H="${SCRIPT_DIR}/src/plugins/coreplugin/coreconstants.h"
 echo "Patching \`${CORE_CONSTANT_H}'"
 sed \
@@ -82,8 +82,8 @@ mv -f "${TMPFILE}" "${CORE_CONSTANT_H}"
 
 
 ## Patch installer.rc
-TMPFILE=`mktemp`
-INSTALLER_RC="${SCRIPT_DIR}/../ide/nightly_builds/installer/installer.rc"
+TMPFILE=`mktemp versionPatch.XXXXXX`
+INSTALLER_RC="${SCRIPT_DIR}/../../dev/ide/nightly_builds/installer/installer.rc"
 echo "Patching \`${INSTALLER_RC}'"
 sed \
         -e "s/"${OLD_DOT_FOUR}"/"${NEW_DOT_FOUR}"/" \
@@ -94,8 +94,8 @@ mv -f "${TMPFILE}" "${INSTALLER_RC}"
 
 
 ## Patch Info.plist
-TMPFILE=`mktemp`
-INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist"
+TMPFILE=`mktemp versionPatch.XXXXXX`
+INFO_PLIST="${SCRIPT_DIR}/share/qtcreator/Info.plist"
 echo "Patching \`${INFO_PLIST}'"
 sed \
         -e "s/"${OLD}"/"${NEW}"/" \
@@ -104,7 +104,7 @@ mv -f "${TMPFILE}" "${INFO_PLIST}"
 
 
 ## Patch qtcreator.qdocconf
-TMPFILE=`mktemp`
+TMPFILE=`mktemp versionPatch.XXXXXX`
 QDOCCONF="${SCRIPT_DIR}/doc/qtcreator.qdocconf"
 echo "Patching \`${QDOCCONF}'"
 sed \
@@ -115,11 +115,11 @@ mv -f "${TMPFILE}" "${QDOCCONF}"
 
 
 ## Patch qtcreator.qdoc
-TMPFILE=`mktemp`
+TMPFILE=`mktemp versionPatch.XXXXXX`
 QDOC="${SCRIPT_DIR}/doc/qtcreator.qdoc"
 echo "Patching \`${QDOC}'"
 sed \
-        -e 's/\(The current version of Qt Creator is \)'${OLD_DOT_THREE}'/\1'${NEW_DOT_THREE}'/' \
+        -e 's/'${OLD_DOT_THREE}'/'${NEW_DOT_THREE}'/' \
     "${QDOC}" > "${TMPFILE}"
 mv -f "${TMPFILE}" "${QDOC}"
 

share/qtcreator/Info.plist

@@ -182,8 +182,8 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.nokia.qtcreator</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.2</string>
+	<string>1.0.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.2</string>
+	<string>1.0.0</string>
 </dict>
 </plist>

src/plugins/bineditor/BinEditor.pluginspec

-<plugin name="BinEditor" version="0.9.2" compatVersion="0.9.2">
+<plugin name="BinEditor" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Binary editor component.</description>
     <url>http://www.trolltech.com/</url>
     <dependencyList>
-        <dependency name="Core" version="0.9.2"/>
-        <dependency name="TextEditor" version="0.9.2"/>
+        <dependency name="Core" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.0"/>
     </dependencyList>
 </plugin>

src/plugins/bookmarks/Bookmarks.pluginspec

-<plugin name="Bookmarks" version="0.9.2" compatVersion="0.9.2">
+<plugin name="Bookmarks" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Bookmarks in text editors.</description>
     <url>http://www.trolltech.com/</url>
     <dependencyList>
-        <dependency name="TextEditor" version="0.9.2"/>
-        <dependency name="ProjectExplorer" version="0.9.2"/>
-        <dependency name="Core" version="0.9.2"/>
+        <dependency name="TextEditor" version="1.0.0"/>
+        <dependency name="ProjectExplorer" version="1.0.0"/>
+        <dependency name="Core" version="1.0.0"/>
     </dependencyList>
 </plugin>

src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec

-<plugin name="CMakeProjectManager" version="0.9.2" compatVersion="0.9.2">
+<plugin name="CMakeProjectManager" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>### TODO</license>
     <description>CMake support</description>
     <url>http://www.trolltech.com/</url>
     <dependencyList>
-        <dependency name="TextEditor" version="0.9.2"/>
-        <dependency name="ProjectExplorer" version="0.9.2"/>
-        <dependency name="CppTools" version="0.9.2"/>
-        <dependency name="CppEditor" version="0.9.2"/>
-        <dependency name="Help" version="0.9.2"/>
+        <dependency name="TextEditor" version="1.0.0"/>
+        <dependency name="ProjectExplorer" version="1.0.0"/>
+        <dependency name="CppTools" version="1.0.0"/>
+        <dependency name="CppEditor" version="1.0.0"/>
+        <dependency name="Help" version="1.0.0"/>
     </dependencyList>
 </plugin>

src/plugins/coreplugin/Core.pluginspec

-<plugin name="Core" version="0.9.2" compatVersion="0.9.2">
+<plugin name="Core" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>

src/plugins/coreplugin/coreconstants.h

@@ -37,9 +37,9 @@
 namespace Core {
 namespace Constants {
 
-#define IDE_VERSION_MAJOR 0
-#define IDE_VERSION_MINOR 9
-#define IDE_VERSION_RELEASE 2
+#define IDE_VERSION_MAJOR 1
+#define IDE_VERSION_MINOR 0
+#define IDE_VERSION_RELEASE 0
 
 #define STRINGIFY_INTERNAL(x) #x
 #define STRINGIFY(x) STRINGIFY_INTERNAL(x)

src/plugins/cpaster/CodePaster.pluginspec

-<plugin name="CodePaster" version="0.9.2" compatVersion="0.9.2">
+<plugin name="CodePaster" version="1.0.0" compatVersion="1.0.0">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>Nokia Beta Version License</license>
     <description>Codepaster plugin for pushing/fetching diff from server</description>
     <url>http://www.trolltech.com/</url>
     <dependencyList>
-        <dependency name="TextEditor" version="0.9.2"/>
-        <dependency name="ProjectExplorer" version="0.9.2"/>
-        <dependency name="Core" version="0.9.2"/>
+        <dependency name="TextEditor" version="1.0.0"/>
+        <dependency name="ProjectExplorer" version="1.0.0"/>
+        <dependency name="Core" version="1.0.0"/>
     </dependencyList>
 </plugin>