Merge remote-tracking branch 'origin/2.2'

Conflicts: src/plugins/debugger/breakhandler.cpp src/plugins/debugger/cdb/cdbengine.cpp
pcacjr · May 16, 2011 · fa0127b · fa0127b
2 parents fcaa6b0 + 5ded3e2
commit fa0127b
Show file tree

Hide file tree

Showing 7 changed files with 9,292 additions and 1,240 deletions.
diff --git a/scripts/createSrcAndDocPackage.sh b/scripts/createSrcAndDocPackage.sh
@@ -9,7 +9,7 @@ usage:
   Creates tar and zip source package from <refspec> and documentation-zip from current checkout.
   Files and directories are named after <version>.
   example:
-    $0 origin/2.0.0 2.0.0-rc1
+    $0 origin/2.2 2.2.0
 USAGE
     exit 1
 fi
@@ -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
 echo "Creating zip archive..."
 git archive --format=zip --prefix=qt-creator-${VERSION}-src/ ${BRANCH} > qt-creator-${VERSION}-src.zip || exit 1
-echo "Creating documentation..."
-rm -r doc/html
-qmake -r && make docs_online || exit 1
-cd doc
-cp -r html qt-creator-${VERSION}
-zip -r ../qt-creator-${VERSION}-doc.zip qt-creator-${VERSION}
-rm -r qt-creator-${VERSION}
+#echo "Creating documentation..."
+#rm -r doc/html
+#qmake -r && make docs_online || exit 1
+#cd doc
+#cp -r html qt-creator-${VERSION}
+#zip -r ../qt-creator-${VERSION}-doc.zip qt-creator-${VERSION}
+#rm -r qt-creator-${VERSION}
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro
@@ -1,6 +1,6 @@
 include(../../../qtcreator.pri)
 
-LANGUAGES = de fr ja pl ru zh_CN
+LANGUAGES = cs de fr hu ja ru sl zh_CN
 
 # var, prepend, append
 defineReplace(prependAll) {

diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -1800,17 +1800,25 @@ static inline bool dumpQObject(const SymbolGroupValue &v, std::wostream &str, vo
 }
 
 // Dump a std::string.
-static bool dumpStd_W_String(const SymbolGroupValue &v, std::wostream &str)
-{
-    // MSVC 2010: Access Bx/_Buf in base class
-    SymbolGroupValue buf = v[unsigned(0)]["_Bx"]["_Buf"];
-    if (!buf) // MSVC2008: Bx/Buf are members
-        buf = v["_Bx"]["_Buf"];
-    if (buf) {
-        str << buf.value();
-        return true;
+static bool dumpStd_W_String(const SymbolGroupValue &v, int type, std::wostream &str)
+{
+    SymbolGroupValue bx = v[unsigned(0)]["_Bx"];
+    int reserved = 0;
+    if (bx) { // MSVC 2010
+        reserved = v[unsigned(0)]["_Myres"].intValue();
+    } else {  // MSVC2008
+        bx = v["_Bx"];
+        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
@@ -2163,7 +2171,7 @@ unsigned dumpSimpleType(SymbolGroupNode  *n, const SymbolGroupValueContext &ctx,
         break;
     case KT_StdString:
     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;
     default:
         break;

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -761,8 +761,12 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
     case AttachExternal:
     case AttachCrashedExternal:
         arguments << QLatin1String("-p") << QString::number(sp.attachPID);
-        if (sp.startMode == AttachCrashedExternal)
+        if (sp.startMode == AttachCrashedExternal) {
             arguments << QLatin1String("-e") << sp.crashParameter << QLatin1String("-g");
+        } else {
+            if (isCreatorConsole(startParameters(), *m_options))
+                arguments << QLatin1String("-pr") << QLatin1String("-pb");
+        }
         break;
     default:
         *errorMessage = QString::fromLatin1("Internal error: Unsupported start mode %1.").arg(sp.startMode);
@@ -838,9 +842,6 @@ void CdbEngine::runEngine()
 {
     if (debug)
         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)
             postCommand(QByteArray("sxe ") + breakEvent.toAscii(), 0);
     postCommand("g", 0);

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
@@ -1492,7 +1492,7 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
                                            ProjectExplorer::Abi::WindowsOS,
                                            ProjectExplorer::Abi::WindowsMsvc2010Flavor,
                                            ProjectExplorer::Abi::PEFormat,
-                                           true);
+                                           hostAbi.wordWidth());
     sp.startMode = AttachToRemote;
     StartRemoteCdbDialog dlg(mainWindow());
     QString previousConnection = configValue(connectionKey).toString();

diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
@@ -258,6 +258,7 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step)
 {
     m_ui.setupUi(this);
     m_ui.command->setExpectedKind(Utils::PathChooser::Command);
+    m_ui.workingDirectory->setExpectedKind(Utils::PathChooser::Directory);
     connect(m_ui.command, SIGNAL(changed(QString)),
             this, SLOT(commandLineEditTextEdited()));
     connect(m_ui.workingDirectory, SIGNAL(changed(QString)),