feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '1.0.0' into master-master

Browse Source 
Conflicts:
	src/plugins/debugger/debugger.pro
	src/plugins/debugger/gdbengine.cpp
This commit is contained in:
Oswald Buddenhagen
2009-02-24 15:15:39 +01:00
parent cf66237c13 7ec95338d5
commit 3fcb20d6bb
42 changed files with 138 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/qtcreator.qdoc
View File

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

10
doc/qtcreator.qdocconf
View File

@@ -17,15 +17,15 @@ sources.fileextensions = "qtcreator.qdoc"
qhp.projects = QtCreator qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp 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.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot = qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \ qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png images/qt-logo.png
qhp.QtCreator.filterAttributes = qtcreator 0.9.2 qhp.QtCreator.filterAttributes = qtcreator 1.0.0
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 0.9.2 qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.0
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 0.9.2 qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.0
# macros.qdocconf # 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" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"30%\" align=\"left\">Copyright &copy; 2008 Nokia</td>\n" \ "<td width=\"30%\" align=\"left\">Copyright &copy; 2008 Nokia</td>\n" \
"<td width=\"40%\" align=\"center\">&nbsp;</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>" "</tr></table></div></address>"

0
fix_makefile_header_dependencies.sh → scripts/fix_makefile_header_dependencies.sh
View File

32
replaceVersion.sh → scripts/replaceVersion.sh
View File

@@ -16,14 +16,14 @@ fi
OLD=`sed 's/\./\\\\./g' <<<"$1"` OLD=`sed 's/\./\\\\./g' <<<"$1"`
NEW=`sed 's/\./\\\\./g' <<<"$2"` NEW=`sed 's/\./\\\\./g' <<<"$2"`
OLD_MAJOR=`sed 's/^\([0-9]\+\)\.[0-9]\+\.[0-9]\+$/\1/' <<<"$1"` OLD_MAJOR=`sed 's/^\([0-9]\)\.[0-9]\.[0-9]$/\1/' <<<"$1"`
NEW_MAJOR=`sed 's/^\([0-9]\+\)\.[0-9]\+\.[0-9]\+$/\1/' <<<"$2"` NEW_MAJOR=`sed 's/^\([0-9]\)\.[0-9]\.[0-9]$/\1/' <<<"$2"`
OLD_MINOR=`sed 's/^[0-9]\+\.\([0-9]\+\)\.[0-9]\+$/\1/' <<<"$1"` OLD_MINOR=`sed 's/^[0-9]\.\([0-9]\)\.[0-9]$/\1/' <<<"$1"`
NEW_MINOR=`sed 's/^[0-9]\+\.\([0-9]\+\)\.[0-9]\+$/\1/' <<<"$2"` NEW_MINOR=`sed 's/^[0-9]\.\([0-9]\)\.[0-9]$/\1/' <<<"$2"`
OLD_RELEASE=`sed 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\)$/\1/' <<<"$1"` OLD_RELEASE=`sed 's/^[0-9]\.[0-9]\.\([0-9]\)$/\1/' <<<"$1"`
NEW_RELEASE=`sed 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\)$/\1/' <<<"$2"` NEW_RELEASE=`sed 's/^[0-9]\.[0-9]\.\([0-9]\)$/\1/' <<<"$2"`
OLD_THREE="${OLD_MAJOR}${OLD_MINOR}${OLD_RELEASE}" OLD_THREE="${OLD_MAJOR}${OLD_MINOR}${OLD_RELEASE}"
NEW_THREE="${NEW_MAJOR}${NEW_MINOR}${NEW_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 ## 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}'" echo "Entering directory \`${SCRIPT_DIR}'"
pushd "${SCRIPT_DIR}" &>/dev/null || exit 1 pushd "${SCRIPT_DIR}" &>/dev/null || exit 1
@@ -61,7 +61,7 @@ pushd "${SCRIPT_DIR}" &>/dev/null || exit 1
## Patch *.pluginspec ## Patch *.pluginspec
while read i ; do while read i ; do
echo "Patching \`$i'" echo "Patching \`$i'"
TMPFILE=`mktemp` TMPFILE=`mktemp versionPatch.XXXXXX`
sed -e 's/version="'"${OLD}"'"/version="'"${NEW}"'"/' \ sed -e 's/version="'"${OLD}"'"/version="'"${NEW}"'"/' \
-e 's/compatVersion="'"${OLD}"'"/compatVersion="'"${NEW}"'"/' \ -e 's/compatVersion="'"${OLD}"'"/compatVersion="'"${NEW}"'"/' \
"${i}" > "${TMPFILE}" "${i}" > "${TMPFILE}"
@@ -70,7 +70,7 @@ done < <(find . -name '*.pluginspec')
## Patch coreconstants.h ## Patch coreconstants.h
TMPFILE=`mktemp` TMPFILE=`mktemp versionPatch.XXXXXX`
CORE_CONSTANT_H="${SCRIPT_DIR}/src/plugins/coreplugin/coreconstants.h" CORE_CONSTANT_H="${SCRIPT_DIR}/src/plugins/coreplugin/coreconstants.h"
echo "Patching \`${CORE_CONSTANT_H}'" echo "Patching \`${CORE_CONSTANT_H}'"
sed \ sed \
@@ -82,8 +82,8 @@ mv -f "${TMPFILE}" "${CORE_CONSTANT_H}"
## Patch installer.rc ## Patch installer.rc
TMPFILE=`mktemp` TMPFILE=`mktemp versionPatch.XXXXXX`
INSTALLER_RC="${SCRIPT_DIR}/../ide/nightly_builds/installer/installer.rc" INSTALLER_RC="${SCRIPT_DIR}/../../dev/ide/nightly_builds/installer/installer.rc"
echo "Patching \`${INSTALLER_RC}'" echo "Patching \`${INSTALLER_RC}'"
sed \ sed \
-e "s/"${OLD_DOT_FOUR}"/"${NEW_DOT_FOUR}"/" \ -e "s/"${OLD_DOT_FOUR}"/"${NEW_DOT_FOUR}"/" \
@@ -94,8 +94,8 @@ mv -f "${TMPFILE}" "${INSTALLER_RC}"
## Patch Info.plist ## Patch Info.plist
TMPFILE=`mktemp` TMPFILE=`mktemp versionPatch.XXXXXX`
INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist" INFO_PLIST="${SCRIPT_DIR}/share/qtcreator/Info.plist"
echo "Patching \`${INFO_PLIST}'" echo "Patching \`${INFO_PLIST}'"
sed \ sed \
-e "s/"${OLD}"/"${NEW}"/" \ -e "s/"${OLD}"/"${NEW}"/" \
@@ -104,7 +104,7 @@ mv -f "${TMPFILE}" "${INFO_PLIST}"
## Patch qtcreator.qdocconf ## Patch qtcreator.qdocconf
TMPFILE=`mktemp` TMPFILE=`mktemp versionPatch.XXXXXX`
QDOCCONF="${SCRIPT_DIR}/doc/qtcreator.qdocconf" QDOCCONF="${SCRIPT_DIR}/doc/qtcreator.qdocconf"
echo "Patching \`${QDOCCONF}'" echo "Patching \`${QDOCCONF}'"
sed \ sed \
@@ -115,11 +115,11 @@ mv -f "${TMPFILE}" "${QDOCCONF}"
## Patch qtcreator.qdoc ## Patch qtcreator.qdoc
TMPFILE=`mktemp` TMPFILE=`mktemp versionPatch.XXXXXX`
QDOC="${SCRIPT_DIR}/doc/qtcreator.qdoc" QDOC="${SCRIPT_DIR}/doc/qtcreator.qdoc"
echo "Patching \`${QDOC}'" echo "Patching \`${QDOC}'"
sed \ 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}" "${QDOC}" > "${TMPFILE}"
mv -f "${TMPFILE}" "${QDOC}" mv -f "${TMPFILE}" "${QDOC}"

4
share/qtcreator/Info.plist
View File

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

BIN
src/app/qtcreator.icns
View File

Binary file not shown.

BIN
src/app/qtcreator.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 281 KiB

After

Width:  |  Height:  |  Size: 281 KiB

6
src/plugins/bineditor/BinEditor.pluginspec
View File

@@ -1,11 +1,11 @@
<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> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Binary editor component.</description> <description>Binary editor component.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

8
src/plugins/bookmarks/Bookmarks.pluginspec
View File

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

12
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
View File

@@ -1,14 +1,14 @@
<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> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>### TODO</license> <license>### TODO</license>
<description>CMake support</description> <description>CMake support</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="CppTools" version="0.9.2"/> <dependency name="CppTools" version="1.0.0"/>
<dependency name="CppEditor" version="0.9.2"/> <dependency name="CppEditor" version="1.0.0"/>
<dependency name="Help" version="0.9.2"/> <dependency name="Help" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

2
src/plugins/coreplugin/Core.pluginspec
View File

@@ -1,4 +1,4 @@
<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> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>

6
src/plugins/coreplugin/coreconstants.h
View File

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

BIN
src/plugins/coreplugin/images/qtcreator_logo_128.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
src/plugins/coreplugin/images/qtcreator_logo_24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/plugins/coreplugin/images/qtcreator_logo_256.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/plugins/coreplugin/images/qtcreator_logo_32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/plugins/coreplugin/images/qtcreator_logo_48.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/plugins/coreplugin/images/qtcreator_logo_512.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
src/plugins/coreplugin/images/qtcreator_logo_64.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

8
src/plugins/cpaster/CodePaster.pluginspec
View File

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

8
src/plugins/cppeditor/CppEditor.pluginspec
View File

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

8
src/plugins/cpptools/CppTools.pluginspec
View File

@@ -1,12 +1,12 @@
<plugin name="CppTools" version="0.9.2" compatVersion="0.9.2"> <plugin name="CppTools" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Tools for analyzing C/C++ code.</description> <description>Tools for analyzing C/C++ code.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="QuickOpen" version="0.9.2"/> <dependency name="QuickOpen" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

10
src/plugins/debugger/Debugger.pluginspec
View File

@@ -1,13 +1,13 @@
<plugin name="Debugger" version="0.9.2" compatVersion="0.9.2"> <plugin name="Debugger" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Debugger integration.</description> <description>Debugger integration.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="CppEditor" version="0.9.2"/><!-- Debugger plugin adds items to the editor's context menu --> <dependency name="CppEditor" version="1.0.0"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="Find" version="0.9.2"/> <dependency name="Find" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

4
src/plugins/debugger/gdbengine.cpp
View File

@@ -1131,6 +1131,7 @@ void GdbEngine::handleAqcuiredInferior()
reloadSourceFiles(); reloadSourceFiles();
tryLoadCustomDumpers(); tryLoadCustomDumpers();
#ifndef Q_OS_MAC
// intentionally after tryLoadCustomDumpers(), // intentionally after tryLoadCustomDumpers(),
// otherwise we'd interupt solib loading. // otherwise we'd interupt solib loading.
if (qq->wantsAllPluginBreakpoints()) { if (qq->wantsAllPluginBreakpoints()) {
@@ -1146,6 +1147,7 @@ void GdbEngine::handleAqcuiredInferior()
sendCommand("set auto-solib-add off"); sendCommand("set auto-solib-add off");
sendCommand("set stop-on-solib-events 0"); sendCommand("set stop-on-solib-events 0");
} }
#endif
// nicer to see a bit of the world we live in // nicer to see a bit of the world we live in
reloadModules(); reloadModules();
attemptBreakpointSynchronization(); attemptBreakpointSynchronization();
@@ -1185,11 +1187,11 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
qq->notifyInferiorStopped(); qq->notifyInferiorStopped();
m_waitingForFirstBreakpointToBeHit = false; m_waitingForFirstBreakpointToBeHit = false;
//
// this will "continue" if done // this will "continue" if done
m_waitingForBreakpointSynchronizationToContinue = true; m_waitingForBreakpointSynchronizationToContinue = true;
// //
// that's the "early stop" // that's the "early stop"
//
handleAqcuiredInferior(); handleAqcuiredInferior();
return; return;
} }

6
src/plugins/designer/Designer.pluginspec
View File

@@ -1,12 +1,12 @@
<plugin name="Designer" version="0.9.2" compatVersion="0.9.2"> <plugin name="Designer" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Qt Designer integration.</description> <description>Qt Designer integration.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<!-- For compiling with CPP support enabled --> <!-- For compiling with CPP support enabled -->
<dependency name="CppEditor" version="0.9.2"/> <dependency name="CppEditor" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

10
src/plugins/fakevim/FakeVim.pluginspec
View File

@@ -1,13 +1,13 @@
<plugin name="FakeVim" version="0.9.2" compatVersion="0.9.2"> <plugin name="FakeVim" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>VI-style keyboard navigation.</description> <description>VI-style keyboard navigation.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="CppEditor" version="0.9.2"/><!-- Plugin adds items to the editor's context menu --> <dependency name="CppEditor" version="1.0.0"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

4
src/plugins/find/Find.pluginspec
View File

@@ -1,10 +1,10 @@
<plugin name="Find" version="0.9.2" compatVersion="0.9.2"> <plugin name="Find" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Provides the find widget and the hooks for find implementations.</description> <description>Provides the find widget and the hooks for find implementations.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

10
src/plugins/git/ScmGit.pluginspec
View File

@@ -1,13 +1,13 @@
<plugin name="ScmGit" version="0.9.2" compatVersion="0.9.2"> <plugin name="ScmGit" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Git integration.</description> <description>Git integration.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="VCSBase" version="0.9.2"/> <dependency name="VCSBase" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

4
src/plugins/helloworld/HelloWorld.pluginspec
View File

@@ -1,10 +1,10 @@
<plugin name="HelloWorld" version="0.9.2" compatVersion="0.9.2"> <plugin name="HelloWorld" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Hello World sample plugin.</description> <description>Hello World sample plugin.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

8
src/plugins/help/Help.pluginspec
View File

@@ -1,12 +1,12 @@
<plugin name="Help" version="0.9.2" compatVersion="0.9.2"> <plugin name="Help" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Help system.</description> <description>Help system.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="Find" version="0.9.2"/> <dependency name="Find" version="1.0.0"/>
<dependency name="QuickOpen" version="0.9.2"/> <dependency name="QuickOpen" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

10
src/plugins/perforce/Perforce.pluginspec
View File

@@ -1,13 +1,13 @@
<plugin name="Perforce" version="0.9.2" compatVersion="0.9.2"> <plugin name="Perforce" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Perforce integration.</description> <description>Perforce integration.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="VCSBase" version="0.9.2"/> <dependency name="VCSBase" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

10
src/plugins/projectexplorer/ProjectExplorer.pluginspec
View File

@@ -1,13 +1,13 @@
<plugin name="ProjectExplorer" version="0.9.2" compatVersion="0.9.2"> <plugin name="ProjectExplorer" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>ProjectExplorer framework that can be extended with different kind of project types.</description> <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="Find" version="0.9.2"/> <dependency name="Find" version="1.0.0"/>
<dependency name="QuickOpen" version="0.9.2"/> <dependency name="QuickOpen" version="1.0.0"/>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

12
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
View File

@@ -1,14 +1,14 @@
<plugin name="Qt4ProjectManager" version="0.9.2" compatVersion="0.9.2"> <plugin name="Qt4ProjectManager" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Provides project type for Qt 4 pro files and tools.</description> <description>Provides project type for Qt 4 pro files and tools.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="CppTools" version="0.9.2"/> <dependency name="CppTools" version="1.0.0"/>
<dependency name="CppEditor" version="0.9.2"/> <dependency name="CppEditor" version="1.0.0"/>
<dependency name="Help" version="0.9.2"/> <dependency name="Help" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

6
src/plugins/qtscripteditor/QtScriptEditor.pluginspec
View File

@@ -1,11 +1,11 @@
<plugin name="QtScriptEditor" version="0.9.2" compatVersion="0.9.2"> <plugin name="QtScriptEditor" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Editor for QtScript.</description> <description>Editor for QtScript.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

4
src/plugins/quickopen/QuickOpen.pluginspec
View File

@@ -1,10 +1,10 @@
<plugin name="QuickOpen" version="0.9.2" compatVersion="0.9.2"> <plugin name="QuickOpen" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description> <description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

4
src/plugins/regexp/RegExp.pluginspec
View File

@@ -1,10 +1,10 @@
<plugin name="RegExp" version="0.9.2" compatVersion="0.9.2"> <plugin name="RegExp" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Regular Expression test widget.</description> <description>Regular Expression test widget.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

4
src/plugins/resourceeditor/ResourceEditor.pluginspec
View File

@@ -1,10 +1,10 @@
<plugin name="ResourceEditor" version="0.9.2" compatVersion="0.9.2"> <plugin name="ResourceEditor" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Editor for qrc files.</description> <description>Editor for qrc files.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

8
src/plugins/snippets/Snippets.pluginspec
View File

@@ -1,12 +1,12 @@
<plugin name="Snippets" version="0.9.2" compatVersion="0.9.2"> <plugin name="Snippets" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Code snippet plugin.</description> <description>Code snippet plugin.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

10
src/plugins/subversion/Subversion.pluginspec
View File

@@ -1,13 +1,13 @@
<plugin name="Subversion" version="0.9.2" compatVersion="0.9.2"> <plugin name="Subversion" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Subversion integration.</description> <description>Subversion integration.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="VCSBase" version="0.9.2"/> <dependency name="VCSBase" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

8
src/plugins/texteditor/TextEditor.pluginspec
View File

@@ -1,12 +1,12 @@
<plugin name="TextEditor" version="0.9.2" compatVersion="0.9.2"> <plugin name="TextEditor" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Text editor framework and the implementation of the basic text editor.</description> <description>Text editor framework and the implementation of the basic text editor.</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="Find" version="0.9.2"/> <dependency name="Find" version="1.0.0"/>
<dependency name="QuickOpen" version="0.9.2"/> <dependency name="QuickOpen" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

8
src/plugins/vcsbase/VCSBase.pluginspec
View File

@@ -1,12 +1,12 @@
<plugin name="VCSBase" version="0.9.2" compatVersion="0.9.2"> <plugin name="VCSBase" version="1.0.0" compatVersion="1.0.0">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright> <copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>Nokia Beta Version License</license> <license>Nokia Beta Version License</license>
<description>Version Control System Base Plugin</description> <description>Version Control System Base Plugin</description>
<url>http://www.trolltech.com/</url> <url>http://www.trolltech.com/</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="0.9.2"/> <dependency name="Core" version="1.0.0"/>
<dependency name="TextEditor" version="0.9.2"/> <dependency name="TextEditor" version="1.0.0"/>
<dependency name="ProjectExplorer" version="0.9.2"/> <dependency name="ProjectExplorer" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

10
tests/manual/gdbdebugger/simple/README Normal file
View File

@@ -0,0 +1,10 @@
Thinks to check:
- loading of custom dumpers (as seen on QByteArray/QString)
- availability of Qt debug information (custom display of QObject derived
class)
- availabitily of Qt sources (single step into some Qt *._cpp_ file)
- setting of breakpoints on dynamically loaded plugins (try plugin.cpp here)
- check I/O (qDebug, std::cout, std::cerr)