Merge commit 'origin/4.5'

Conflicts:

	src/plugins/kbddrivers/usb/main.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qwidget/tst_qwidget.cpp

2 files changed, 11 insertions, 15 deletions

diff --git a/tools/designer/src/designer/qdesigner_workbench.cpp b/tools/designer/src/designer/qdesigner_workbench.cpp
index 04cd105..2ac9e1f 100644
--- a/tools/designer/src/designer/qdesigner_workbench.cpp
+++ b/tools/designer/src/designer/qdesigner_workbench.cpp
@@ -410,6 +410,12 @@ void QDesignerWorkbench::switchToDockedMode()
 
     switchToNeutralMode();
 
+#ifndef Q_WS_MAC
+    QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow();
+    widgetBoxWrapper->action()->setVisible(true);
+    widgetBoxWrapper->setWindowTitle(tr("Widget Box"));
+#endif
+
     m_mode = DockedMode;
     const QDesignerSettings settings(m_core);
     m_dockedMainWindow = new DockedMainWindow(this, m_toolbarMenu, m_toolWindows);
@@ -462,7 +468,6 @@ void QDesignerWorkbench::switchToTopLevelMode()
     // make sure that the widgetbox is visible if it is different from neutral.
     QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow();
     Q_ASSERT(widgetBoxWrapper);
-    const bool needWidgetBoxWrapperVisible = widgetBoxWrapper->action()->isChecked();
 
     switchToNeutralMode();
     const QPoint desktopOffset = desktopGeometry().topLeft();
@@ -501,9 +506,6 @@ void QDesignerWorkbench::switchToTopLevelMode()
         found_visible_window |= tw->isVisible();
     }
 
-    if (needWidgetBoxWrapperVisible)
-        widgetBoxWrapper->action()->trigger();
-
     if (!m_toolWindows.isEmpty() && !found_visible_window)
         m_toolWindows.first()->show();
 
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index 47c1ec2..a962152 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -68,8 +68,10 @@
 
 #ifdef Q_OS_WIN32
 #define QT_POPEN _popen
+#define QT_PCLOSE _pclose
 #else
 #define QT_POPEN popen
+#define QT_PCLOSE pclose
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -1513,6 +1515,8 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
                         output += QLatin1String(buff);
                     }
                     ret += split_value_list(output);
+                    if (proc)
+                        QT_PCLOSE(proc);
                 }
             }
             break;
@@ -2067,7 +2071,7 @@ bool ProFileEvaluator::Private::evaluateFile(const QString &fileName, bool *resu
     ProFile *pro = q->parsedProFile(fileName);
     if (pro) {
         m_profileStack.push(pro);
-        ok = (currentProFile() ? pro->Accept(this) : false);
+        ok = pro->Accept(this);
         m_profileStack.pop();
         q->releaseParsedProFile(pro);
 
@@ -2077,16 +2081,6 @@ bool ProFileEvaluator::Private::evaluateFile(const QString &fileName, bool *resu
         if (result)
             *result = false;
     }
-/*    if (ok && readFeatures) {
-        QStringList configs = values("CONFIG");
-        QSet<QString> processed;
-        foreach (const QString &fn, configs) {
-            if (!processed.contains(fn)) {
-                processed.insert(fn);
-                evaluateFeatureFile(fn, 0);
-            }
-        }
-    } */
 
     return ok;
 }