Fix crash with evaluation license

With QWS, an infinite loop is formed at application startup
when commercial evaluation license is used and QT_EVAL is defined.

Change-Id: If9712428932b51f5c8eee9ef2d0d444da06a25d9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp
index 2b07fa9..1624bfe 100644 (file)
--- a/src/corelib/kernel/qtcore_eval.cpp
+++ b/src/corelib/kernel/qtcore_eval.cpp
@@ -555,13 +555,8 @@ void qt_eval_init_widget(QWidget *w)
 {
     if (qt_eval_days_left() == -2)
         return;
-    if (w->isTopLevel()) {
-        QString windowTitle = w->windowTitle();
-        if (windowTitle.isEmpty()) {
-            w->setWindowTitle(QLatin1String(" "));
-        } else if (!windowTitle.startsWith(qt_eval_title_prefix())) {
-            qt_eval_adapt_window_title(windowTitle);
-        }
+    if (w->isTopLevel() && w->windowTitle().isEmpty() && w->windowType() != Qt::Desktop ) {
+        w->setWindowTitle(QLatin1String(" "));
     }
 }
 #endif