From 199741d0260f5cbdb05e64fe73cfca1820da93d1 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 23 Jun 2012 10:02:11 +0200 Subject: Fix applicationName() being empty in QApplication. A virtual method was reimplemented to return an always-empty string, probably a leftover from a refactoring. This fix showed that tst_qwidget_window was buggy: between Qt4 and Qt5, a "Before" became "After", which made "Before" unused, and was masking the fact that the app name was empty by default. In addition, the earlier Qt5 change that made the app name default to argv[0] now requires updating this test, now that it's actually working. Change-Id: I5360026821a9b95bedd0ff09dba3d51a22e542b7 Reviewed-by: Marc Mutz Reviewed-by: Paul Olav Tvete --- src/corelib/kernel/qcoreapplication_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/kernel/qcoreapplication_p.h') diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index 33021d443f..1f1d58c009 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -78,7 +78,7 @@ public: void _q_initializeProcessManager(); - virtual QString appName() const; + QString appName() const; virtual void createEventDispatcher(); static void removePostedEvent(QEvent *); #ifdef Q_OS_WIN -- cgit v1.2.3