diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2012-03-07 13:04:33 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-27 11:52:31 (GMT) |
| commit | 6889847e6ebda30775455aef95844ed022c1cbfb (patch) | |
| tree | 9624e7cd4eb4e808fee619971535a0c5b8cca180 /src | |
| parent | ef173b3067dcd4bd8fb985b5124cd7efd6a24e14 (diff) | |
| download | Qt-6889847e6ebda30775455aef95844ed022c1cbfb.zip Qt-6889847e6ebda30775455aef95844ed022c1cbfb.tar.gz Qt-6889847e6ebda30775455aef95844ed022c1cbfb.tar.bz2 | |
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: Ia8e9a02c95e7277f49cf4866bae2422e6cef7973
(cherry picked from commit bf3c3862b486bbc472117d8e11e03f621b11c064)
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -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 2f9ccda..a88d507 100644 --- a/src/corelib/kernel/qtcore_eval.cpp +++ b/src/corelib/kernel/qtcore_eval.cpp @@ -557,13 +557,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 |