diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2012-03-09 11:53:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-11 01:42:12 +0200 |
| commit | bf3c3862b486bbc472117d8e11e03f621b11c064 (patch) | |
| tree | e3552283a5c46e177d7d2c6f835d870dc70808fb /src/corelib | |
| parent | 592bb3ca5eab21246c3194e18b534defb0fb7022 (diff) | |
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qtcore_eval.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp index 2b07fa99cc..1624bfef5c 100644 --- 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 |