Designer: Reset override cursors while loading forms...

in case Designer shows messages about missing resources or such.

1 files changed, 14 insertions, 0 deletions

diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 39c22d062c..f18f57e0a7 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -49,6 +49,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
 #include <QtCore/QFile>
+#include <QtGui/QApplication>
 
 namespace Designer {
 
@@ -103,7 +104,20 @@ bool FormWindowEditor::createNew(const QString &contents)
     if (contents.isEmpty())
         return false;
 
+    // If we have an override cursor, reset it over Designer loading,
+    // should it pop up messages about missing resources or such.
+    const bool hasOverrideCursor = QApplication::overrideCursor();
+    QCursor overrideCursor;
+    if (hasOverrideCursor) {
+        overrideCursor = QCursor(*QApplication::overrideCursor());
+        QApplication::restoreOverrideCursor();
+    }
+
     form->setContents(contents);
+
+    if (hasOverrideCursor)
+        QApplication::setOverrideCursor(overrideCursor);
+
     if (form->mainContainer() == 0)
         return false;