Commit fa0127be authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/2.2'

Conflicts:
	src/plugins/debugger/breakhandler.cpp
	src/plugins/debugger/cdb/cdbengine.cpp
parents fcaa6b0d 5ded3e2f
...@@ -9,7 +9,7 @@ usage: ...@@ -9,7 +9,7 @@ usage:
Creates tar and zip source package from <refspec> and documentation-zip from current checkout. Creates tar and zip source package from <refspec> and documentation-zip from current checkout.
Files and directories are named after <version>. Files and directories are named after <version>.
example: example:
$0 origin/2.0.0 2.0.0-rc1 $0 origin/2.2 2.2.0
USAGE USAGE
exit 1 exit 1
fi fi
...@@ -21,10 +21,10 @@ echo "Creating tar archive..." ...@@ -21,10 +21,10 @@ echo "Creating tar archive..."
git archive --format=tar --prefix=qt-creator-${VERSION}-src/ ${BRANCH} | gzip > qt-creator-${VERSION}-src.tar.gz || exit 1 git archive --format=tar --prefix=qt-creator-${VERSION}-src/ ${BRANCH} | gzip > qt-creator-${VERSION}-src.tar.gz || exit 1
echo "Creating zip archive..." echo "Creating zip archive..."
git archive --format=zip --prefix=qt-creator-${VERSION}-src/ ${BRANCH} > qt-creator-${VERSION}-src.zip || exit 1 git archive --format=zip --prefix=qt-creator-${VERSION}-src/ ${BRANCH} > qt-creator-${VERSION}-src.zip || exit 1
echo "Creating documentation..." #echo "Creating documentation..."
rm -r doc/html #rm -r doc/html
qmake -r && make docs_online || exit 1 #qmake -r && make docs_online || exit 1
cd doc #cd doc
cp -r html qt-creator-${VERSION} #cp -r html qt-creator-${VERSION}
zip -r ../qt-creator-${VERSION}-doc.zip qt-creator-${VERSION} #zip -r ../qt-creator-${VERSION}-doc.zip qt-creator-${VERSION}
rm -r qt-creator-${VERSION} #rm -r qt-creator-${VERSION}
include(../../../qtcreator.pri) include(../../../qtcreator.pri)
LANGUAGES = de fr ja pl ru zh_CN LANGUAGES = cs de fr hu ja ru sl zh_CN
# var, prepend, append # var, prepend, append
defineReplace(prependAll) { defineReplace(prependAll) {
......
...@@ -1800,17 +1800,25 @@ static inline bool dumpQObject(const SymbolGroupValue &v, std::wostream &str, vo ...@@ -1800,17 +1800,25 @@ static inline bool dumpQObject(const SymbolGroupValue &v, std::wostream &str, vo
} }
// Dump a std::string. // Dump a std::string.
static bool dumpStd_W_String(const SymbolGroupValue &v, std::wostream &str) static bool dumpStd_W_String(const SymbolGroupValue &v, int type, std::wostream &str)
{ {
// MSVC 2010: Access Bx/_Buf in base class SymbolGroupValue bx = v[unsigned(0)]["_Bx"];
SymbolGroupValue buf = v[unsigned(0)]["_Bx"]["_Buf"]; int reserved = 0;
if (!buf) // MSVC2008: Bx/Buf are members if (bx) { // MSVC 2010
buf = v["_Bx"]["_Buf"]; reserved = v[unsigned(0)]["_Myres"].intValue();
if (buf) { } else { // MSVC2008
str << buf.value(); bx = v["_Bx"];
return true; reserved = v["_Myres"].intValue();
} }
return false; if (!bx || reserved < 0)
return false;
// 'Buf' array for small strings, else pointer 'Ptr'.
const int bufSize = type == KT_StdString ? 16 : 8; // see basic_string.
const SymbolGroupValue string = bufSize <= reserved ? bx["_Ptr"] : bx["_Buf"];
if (!string)
return false;
str << string.value();
return true;
} }
// QVariant employs a template for storage where anything bigger than the data union // QVariant employs a template for storage where anything bigger than the data union
...@@ -2163,7 +2171,7 @@ unsigned dumpSimpleType(SymbolGroupNode *n, const SymbolGroupValueContext &ctx, ...@@ -2163,7 +2171,7 @@ unsigned dumpSimpleType(SymbolGroupNode *n, const SymbolGroupValueContext &ctx,
break; break;
case KT_StdString: case KT_StdString:
case KT_StdWString: case KT_StdWString:
rc = dumpStd_W_String(v, str) ? SymbolGroupNode::SimpleDumperOk : SymbolGroupNode::SimpleDumperFailed; rc = dumpStd_W_String(v, kt, str) ? SymbolGroupNode::SimpleDumperOk : SymbolGroupNode::SimpleDumperFailed;
break; break;
default: default:
break; break;
......
...@@ -761,8 +761,12 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa ...@@ -761,8 +761,12 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
case AttachExternal: case AttachExternal:
case AttachCrashedExternal: case AttachCrashedExternal:
arguments << QLatin1String("-p") << QString::number(sp.attachPID); arguments << QLatin1String("-p") << QString::number(sp.attachPID);
if (sp.startMode == AttachCrashedExternal) if (sp.startMode == AttachCrashedExternal) {
arguments << QLatin1String("-e") << sp.crashParameter << QLatin1String("-g"); arguments << QLatin1String("-e") << sp.crashParameter << QLatin1String("-g");
} else {
if (isCreatorConsole(startParameters(), *m_options))
arguments << QLatin1String("-pr") << QLatin1String("-pb");
}
break; break;
default: default:
*errorMessage = QString::fromLatin1("Internal error: Unsupported start mode %1.").arg(sp.startMode); *errorMessage = QString::fromLatin1("Internal error: Unsupported start mode %1.").arg(sp.startMode);
...@@ -838,9 +842,6 @@ void CdbEngine::runEngine() ...@@ -838,9 +842,6 @@ void CdbEngine::runEngine()
{ {
if (debug) if (debug)
qDebug("runEngine"); qDebug("runEngine");
// Resume the threads frozen by the console stub.
if (isCreatorConsole(startParameters(), *m_options))
postCommand("~* m", 0);
foreach (const QString &breakEvent, m_options->breakEvents) foreach (const QString &breakEvent, m_options->breakEvents)
postCommand(QByteArray("sxe ") + breakEvent.toAscii(), 0); postCommand(QByteArray("sxe ") + breakEvent.toAscii(), 0);
postCommand("g", 0); postCommand("g", 0);
......
...@@ -1492,7 +1492,7 @@ void DebuggerPluginPrivate::startRemoteCdbSession() ...@@ -1492,7 +1492,7 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
ProjectExplorer::Abi::WindowsOS, ProjectExplorer::Abi::WindowsOS,
ProjectExplorer::Abi::WindowsMsvc2010Flavor, ProjectExplorer::Abi::WindowsMsvc2010Flavor,
ProjectExplorer::Abi::PEFormat, ProjectExplorer::Abi::PEFormat,
true); hostAbi.wordWidth());
sp.startMode = AttachToRemote; sp.startMode = AttachToRemote;
StartRemoteCdbDialog dlg(mainWindow()); StartRemoteCdbDialog dlg(mainWindow());
QString previousConnection = configValue(connectionKey).toString(); QString previousConnection = configValue(connectionKey).toString();
......
...@@ -258,6 +258,7 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step) ...@@ -258,6 +258,7 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
m_ui.command->setExpectedKind(Utils::PathChooser::Command); m_ui.command->setExpectedKind(Utils::PathChooser::Command);
m_ui.workingDirectory->setExpectedKind(Utils::PathChooser::Directory);
connect(m_ui.command, SIGNAL(changed(QString)), connect(m_ui.command, SIGNAL(changed(QString)),
this, SLOT(commandLineEditTextEdited())); this, SLOT(commandLineEditTextEdited()));
connect(m_ui.workingDirectory, SIGNAL(changed(QString)), connect(m_ui.workingDirectory, SIGNAL(changed(QString)),
......
Markdown is supported
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