Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h

4 files changed, 2 insertions, 15 deletions

diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 3223e828e7..2e6fa7f0ae 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -276,7 +276,7 @@ void EditorToolBar::listContextMenu(QPoint pos)
     QMenu menu;
     menu.addAction(tr("Copy full path to clipboard"));
     if (menu.exec(m_editorList->mapToGlobal(pos))) {
-        QApplication::clipboard()->setText(fileName);
+        QApplication::clipboard()->setText(QDir::toNativeSeparators(fileName));
     }
 }
 
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index ccad6c2e10..072d4ae74a 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -736,7 +736,7 @@ QString FileManager::getSaveAsFileName(IFile *file)
 }
 
 /*!
-    \fn QString FileManager::getOpenFileNames(const QStringList &filters, QString *selectedFilter) const
+    \fn QString FileManager::getOpenFileNames(const QStringList &filters, const QString &path, QString *selectedFilter) const
 
     Asks the user for a set of file names to be opened.
 */
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 7fa1eb40af..e20d9cde4e 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -1303,18 +1303,6 @@ QPrinter *MainWindow::printer() const
     return m_printer;
 }
 
-void MainWindow::openProject()
-{
-    // ### We need a way to access the mimedatabase and differentiate
-    // between project types and other files. This is currently not possible
-    const QString filters = "All Files (*);;Projects(*.pro *.qmlproject)";
-    QString selectedFilters = "Projects(*.pro *.qmlproject)";
-    QStringList files =
-            Core::ICore::instance()->fileManager()->getOpenFileNames(
-                    filters, tr("Open Project"), &selectedFilters);
-    openFiles(files);
-}
-
 void MainWindow::setFullScreen(bool on)
 {
     if (bool(windowState() & Qt::WindowFullScreen) == on)
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 5c3e449fa8..57bea2133a 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -129,7 +129,6 @@ signals:
     void windowActivated();
 
 public slots:
-    void openProject();
     void newFile();
     void openFileWith();
     void exit();