Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d

src/plugins/coreplugin/dialogs/ioptionspage.h

@@ -63,8 +63,8 @@ protected:
     void setCategoryIcon(const QString &categoryIcon) { m_categoryIcon = categoryIcon; }
 
     Id m_id;
-    QString m_displayName;
     Id m_category;
+    QString m_displayName;
     QString m_displayCategory;
     QString m_categoryIcon;
 };

src/plugins/coreplugin/dialogs/settingsdialog.cpp

@@ -73,11 +73,11 @@ class Category
 {
 public:
     Id id;
+    int index;
     QString displayName;
     QIcon icon;
     QList<IOptionsPage *> pages;
     QList<IOptionsPageProvider *> providers;
-    int index;
     QTabWidget *tabWidget;
 };
 

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -887,6 +887,9 @@ bool EditorManager::closeEditors(const QList<IEditor*> &editorsToClose, bool ask
     if (acceptedEditors.isEmpty())
         return false;
 
+    // close Editor History list
+    windowPopup()->setVisible(false);
+
     // add duplicates
     QList<IEditor *> duplicates;
     foreach (IEditor *editor, acceptedEditors)

src/plugins/coreplugin/id.cpp

@@ -73,7 +73,7 @@ public:
         : n(length), str(s)
     {
         if (!n)
-            length = n = strlen(s);
+            length = n = static_cast<int>(strlen(s));
         h = 0;
         while (length--) {
             h = (h << 4) + *s++;

src/plugins/coreplugin/mainwindow.cpp

@@ -773,19 +773,19 @@ void MainWindow::registerDefaultActions()
     else
         tmpaction = new QAction(icon, tr("About &Qt Creator..."), this);
     cmd = ActionManager::registerAction(tmpaction, Constants::ABOUT_QTCREATOR, globalContext);
-    mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
-    tmpaction->setEnabled(true);
     if (Utils::HostOsInfo::isMacHost())
         cmd->action()->setMenuRole(QAction::ApplicationSpecificRole);
+    mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
+    tmpaction->setEnabled(true);
     connect(tmpaction, SIGNAL(triggered()), this,  SLOT(aboutQtCreator()));
 
     //About Plugins Action
     tmpaction = new QAction(tr("About &Plugins..."), this);
     cmd = ActionManager::registerAction(tmpaction, Constants::ABOUT_PLUGINS, globalContext);
-    mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
-    tmpaction->setEnabled(true);
     if (Utils::HostOsInfo::isMacHost())
         cmd->action()->setMenuRole(QAction::ApplicationSpecificRole);
+    mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
+    tmpaction->setEnabled(true);
     connect(tmpaction, SIGNAL(triggered()), this,  SLOT(aboutPlugins()));
     // About Qt Action
 //    tmpaction = new QAction(tr("About &Qt..."), this);
@@ -1128,7 +1128,10 @@ void MainWindow::updateFocusWidget(QWidget *old, QWidget *now)
             p = p->parentWidget();
         }
     }
-    updateContextObject(newContext);
+
+    // ignore toplevels that define no context, like popups without parent
+    if (newContext || qApp->focusWidget() == focusWidget())
+        updateContextObject(newContext);
 }
 
 void MainWindow::updateContextObject(IContext *context)

src/plugins/coreplugin/progressmanager/progressbar.cpp

@@ -45,7 +45,8 @@ using namespace Core::Internal;
 #define CANCELBUTTON_SIZE 15
 
 ProgressBar::ProgressBar(QWidget *parent)
-    : QWidget(parent), m_error(false), m_minimum(1), m_maximum(100), m_value(1), m_cancelButtonFader(0), m_finished(false)
+    : QWidget(parent), m_minimum(1), m_maximum(100), m_value(1), m_cancelButtonFader(0),
+      m_finished(false), m_error(false)
 {
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     setMouseTracking(true);

src/plugins/coreplugin/progressmanager/progressbar.h

@@ -75,13 +75,13 @@ private:
     QImage bar;
     QString m_text;
     QString m_title;
-    bool m_error;
     int m_progressHeight;
     int m_minimum;
     int m_maximum;
     int m_value;
     float m_cancelButtonFader;
     bool m_finished;
+    bool m_error;
 };
 
 } // namespace Internal