Merge commit 'origin/1.3'

doc/doxygen/Doxyfile

@@ -843,7 +843,7 @@ DOCSET_FEEDNAME        = "Qt Creator API"
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
-DOCSET_BUNDLE_ID       = com.qtsoftware.qt-creator
+DOCSET_BUNDLE_ID       = com.nokia.qt-creator
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the

src/plugins/cpptools/cppfindreferences.cpp

@@ -23,7 +23,7 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
 

src/plugins/cpptools/cppfindreferences.h

@@ -23,7 +23,7 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
 

src/plugins/debugger/cdb/cdbdebugengine.cpp

@@ -1588,6 +1588,8 @@ QList<Symbol> CdbDebugEngine::moduleSymbols(const QString &moduleName)
 
 void CdbDebugEngine::reloadRegisters()
 {
+    if (state() != InferiorStopped)
+        return;
     const int intBase = 10;
     if (debugCDB)
         qDebug() << Q_FUNC_INFO << intBase;

src/plugins/debugger/gdb/gdbengine.cpp

@@ -2568,6 +2568,8 @@ void GdbEngine::handleStackListThreads(const GdbResponse &response)
 
 void GdbEngine::reloadRegisters()
 {
+    if (state() != InferiorStopped)
+        return;
     if (!m_registerNamesListed) {
         postCommand(_("-data-list-register-names"), CB(handleRegisterListNames));
         m_registerNamesListed = true;