Merge branch '2.4' of ssh://codereview.qt-project.org/qt-creator/qt-creator into 2.4

share/qtcreator/dumper/dumper.py

@@ -147,6 +147,11 @@ def lookupType(typestring):
         type = gdb.lookup_type(ts)
     except RuntimeError, error:
         #warn("LOOKING UP '%s': %s" % (ts, error))
+        if type is None:
+            pos = typestring.find("<unnamed>")
+            if pos != -1:
+                # See http://sourceware.org/bugzilla/show_bug.cgi?id=13269
+                return lookupType(typestring.replace("<unnamed>", "(anonymous namespace)"))
         # See http://sourceware.org/bugzilla/show_bug.cgi?id=11912
         exp = "(class '%s'*)0" % ts
         try:

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -288,7 +288,9 @@ bool CMakeProject::parseCMakeLists()
     allIncludePaths.append(cbpparser.includeFiles());
 
     QStringList allFrameworkPaths;
-    QList<ProjectExplorer::HeaderPath> allHeaderPaths = activeBC->toolChain()->systemHeaderPaths();
+    QList<ProjectExplorer::HeaderPath> allHeaderPaths;
+    if (activeBC->toolChain())
+        allHeaderPaths = activeBC->toolChain()->systemHeaderPaths();
     foreach (const ProjectExplorer::HeaderPath &headerPath, allHeaderPaths) {
         if (headerPath.kind() == ProjectExplorer::HeaderPath::FrameworkHeaderPath)
             allFrameworkPaths.append(headerPath.path());
@@ -302,12 +304,12 @@ bool CMakeProject::parseCMakeLists()
         CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
         if (pinfo.includePaths != allIncludePaths
             || pinfo.sourceFiles != m_files
-            || pinfo.defines != activeBC->toolChain()->predefinedMacros()
+            || pinfo.defines != (activeBC->toolChain() ? activeBC->toolChain()->predefinedMacros() : QByteArray())
             || pinfo.frameworkPaths != allFrameworkPaths)  {
             pinfo.includePaths = allIncludePaths;
             // TODO we only want C++ files, not all other stuff that might be in the project
             pinfo.sourceFiles = m_files;
-            pinfo.defines = activeBC->toolChain()->predefinedMacros(); // TODO this is to simplistic
+            pinfo.defines =  (activeBC->toolChain() ? activeBC->toolChain()->predefinedMacros() : QByteArray()); // TODO this is to simplistic
             pinfo.frameworkPaths = allFrameworkPaths;
             modelmanager->updateProjectInfo(pinfo);
             m_codeModelFuture.cancel();

src/plugins/cmakeprojectmanager/makestep.cpp

@@ -142,7 +142,10 @@ bool MakeStep::init()
     pp->setMacroExpander(bc->macroExpander());
     pp->setEnvironment(bc->environment());
     pp->setWorkingDirectory(bc->buildDirectory());
-    pp->setCommand(bc->toolChain()->makeCommand());
+    if (bc->toolChain())
+        pp->setCommand(bc->toolChain()->makeCommand());
+    else
+        pp->setCommand(QLatin1String("make"));
     pp->setArguments(arguments);
 
     setOutputParser(new ProjectExplorer::GnuMakeParser());

src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp

@@ -659,10 +659,13 @@ static void buildContextProperties(
                     typeScope = scope; // incorrect but may be an ok fallback
                 ClassOrNamespace *binding = typeOf.context().lookupType(namedType->name(), typeScope);
                 if (binding && !binding->symbols().isEmpty()) {
-                    Class *klass = binding->symbols().first()->asClass();
+                    // find the best 'Class' symbol
-                    if (klass) {
+                    for (int i = binding->symbols().size() - 1; i >= 0; --i) {
-                        FakeMetaObject::Ptr fmo = buildFakeMetaObject(klass, fakeMetaObjects, typeOf);
+                        if (Class *klass = binding->symbols().at(i)->asClass()) {
-                        typeName = fmo->className();
+                            FakeMetaObject::Ptr fmo = buildFakeMetaObject(klass, fakeMetaObjects, typeOf);
+                            typeName = fmo->className();
+                            break;
+                        }
                     }
                 }
             }

tests/system/objects.map

@@ -38,6 +38,7 @@
 :Qt Gui Application_Qt4ProjectManager::Internal::GuiAppWizardDialog	{type='Qt4ProjectManager::Internal::GuiAppWizardDialog' unnamed='1' visible='1' windowTitle='Qt Gui Application'}
 :QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector	{type='ProjectExplorer::Internal::MiniProjectTargetSelector'}
 :QtCreator.MenuBar_ProjectExplorer::Internal::ProjectListWidget	{type='ProjectExplorer::Internal::ProjectListWidget' window=':QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector'}
+:addToVersionControlComboBox_QComboBox	{name='addToVersionControlComboBox' type='QComboBox' visible='1'}
 :formFileLineEdit_Utils::FileNameValidatingLineEdit	{buddy=':Qt Gui Application.Form file:_QLabel' name='formFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'}
 :frame.nameLineEdit_Utils::ProjectNameValidatingLineEdit	{container=':Qt Gui Application.frame_QFrame' name='nameLineEdit' type='Utils::ProjectNameValidatingLineEdit' visible='1'}
 :frame_Utils::BaseValidatingLineEdit	{container=':Qt Gui Application.frame_QFrame' type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'}

tests/system/shared/project.py

@@ -112,6 +112,7 @@ def createProject_Qt_GUI(path, projectName, qtVersion, checks):
         test.verify(ui_found > cpp_found, "'" + ui_file + "' found at index " + str(ui_found))
         test.verify(pro_found > ui_found, "'" + pro_file + "' found at index " + str(pro_found))
 
+    selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
     clickButton(waitForObject(":Qt Gui Application.Finish_QPushButton"))
 
     if checks:
@@ -159,4 +160,5 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N
     chooseDestination(destination)
     snooze(1)
     clickButton(nextButton)
+    selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
     clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000))

tests/system/suite_qtquick/tst_qtquick_creation3/test.py

@@ -30,6 +30,7 @@ def createNewQtQuickUI():
         clickButton(cbDefaultLocation)
     # now there's the 'untitled' project inside a temporary directory - step forward...!
     clickButton(waitForObject("{text~='(Next.*|Continue)' type='QPushButton' visible='1'}", 20000))
+    selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
     clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000))
 
 def cleanup():

tests/system/suite_qtquick/tst_qtquick_creation4/test.py

@@ -45,6 +45,7 @@ def createNewQmlExtension():
                               "type='QLineEdit' unnamed='1' visible='1'}", 20000)
     replaceEditorContent(uriLineEd, "com.nokia.test.qmlcomponents")
     clickButton(nextButton)
+    selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
     clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000))
 
 def cleanup():