Merge commit 'origin/master'

src/plugins/designer/editorwidget.cpp

@@ -41,7 +41,7 @@ using namespace Designer::Constants;
 
 enum { ActionEditorTab, SignalSlotEditorTab };
 
-enum { wantSignalSlotEditor = 0 };
+enum { wantSignalSlotEditor = 1 };
 
 namespace Designer {
 namespace Internal {

src/plugins/projectexplorer/projectexplorer.cpp

@@ -1618,7 +1618,7 @@ void ProjectExplorerPlugin::addExistingFiles()
 
 void ProjectExplorerPlugin::openFile()
 {
-    if (m_currentNode)
+    if (!m_currentNode)
         return;
     Core::EditorManager *em = Core::EditorManager::instance();
     em->openEditor(m_currentNode->path());