summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qapplication_p.h
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-06-23 10:02:11 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-16 16:30:55 +0200
commit199741d0260f5cbdb05e64fe73cfca1820da93d1 (patch)
tree82276c92bd8c986fa71b76a45e067ab996b79e24 /src/widgets/kernel/qapplication_p.h
parentcbddca5f02eb4fec367ce7fd6b3d71191ca5c348 (diff)
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 <marc.mutz@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qapplication_p.h')
-rw-r--r--src/widgets/kernel/qapplication_p.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 3ce590865b..3d08465b87 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -135,7 +135,6 @@ public:
void createEventDispatcher();
- QString appName() const;
static void dispatchEnterLeave(QWidget *enter, QWidget *leave);
//modality