diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-05 14:03:39 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-05 13:42:21 +0000 |
commit | c4a53f647f4ba7cb6898a38fd1056f81fdcfe371 (patch) | |
tree | 14a608527870e7043594ed9a6ad698a5a46e2fb7 /src/widgets/kernel/qapplication.cpp | |
parent | ce29de5c33f9addd22ffa44d575b4b044598b18b (diff) |
QtWidgets: Fix build & warnings with QT_NO_GRAPHICSVIEW.
kernel\qapplication.cpp(3157,18) : warning: unused variable 'isGraphicsWidget' [-Wunused-variable]
bool isGraphicsWidget = false;
^
kernel\qwidget.cpp(6446,18) : warning: unused variable 'window' [-Wunused-variable]
if (QWidget *window = w->window()) {
^
kernel\qwidget.cpp(7949,50) : error: no member named 'proxyWidget' in 'QWExtra'
if ((q->isWindow() && (!extra || !extra->proxyWidget))
~~~~~ ^
kernel\qwidget.cpp(8084,50) : error: no member named 'proxyWidget' in 'QWExtra'
if ((q->isWindow() && (!extra || !extra->proxyWidget))
Change-Id: I8474ab0ab4617c6588707ce0c2f7a97e4d0e54da
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 91302d9e62..3ab477ccfb 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -3161,9 +3161,8 @@ bool QApplication::notify(QObject *receiver, QEvent *e) case QEvent::KeyRelease: { bool isWidget = receiver->isWidgetType(); - bool isGraphicsWidget = false; #ifndef QT_NO_GRAPHICSVIEW - isGraphicsWidget = !isWidget && qobject_cast<QGraphicsWidget *>(receiver); + const bool isGraphicsWidget = !isWidget && qobject_cast<QGraphicsWidget *>(receiver); #endif QKeyEvent* key = static_cast<QKeyEvent*>(e); bool def = key->isAccepted(); |