Merge commit 'origin/1.3'

Conflicts: src/plugins/cpptools/cppcodecompletion.h src/plugins/debugger/gdb/gdbengine.cpp src/plugins/qmleditor/QmlEditor.pluginspec
2009-10-26 13:51:56 +01:00
parent 4504aec7de 3c0ca8c188
commit 441ece365a
138 changed files with 4799 additions and 2432 deletions
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -618,7 +618,7 @@ void HelpPlugin::extensionsInitialized()
                + QLatin1String("../../share/doc/qtcreator/qtcreator.qch"));
 #endif
            if (!hc.registerDocumentation(qchFileName))
-                qDebug() << hc.error();
+                qDebug() << qPrintable(hc.error());
            needsSetup = true;
        }