summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrever Fischer <tdfischer@fedoraproject.org>2010-08-11 16:58:43 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-11 17:01:17 (GMT)
commit87d8bd31efb2a41c7e95d22ec86904c3bb7fdd79 (patch)
tree2d72a9431f134d6516aa8540b36a18460aba8ae8
parent2f72664836ca16ef257759108e27d5ec6b8995a1 (diff)
downloadQt-87d8bd31efb2a41c7e95d22ec86904c3bb7fdd79.zip
Qt-87d8bd31efb2a41c7e95d22ec86904c3bb7fdd79.tar.gz
Qt-87d8bd31efb2a41c7e95d22ec86904c3bb7fdd79.tar.bz2
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
Merge-request: 2444 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--src/gui/kernel/qapplication_win.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index ec26e81..0c48bfd 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -716,8 +716,10 @@ static void qt_set_windows_updateScrollBar(QWidget *widget)
if (QWidget *w = static_cast<QWidget *>(o))
qt_set_windows_updateScrollBar(w);
}
+#ifndef QT_NO_SCROLLBAR
if (qobject_cast<QScrollBar*>(widget))
widget->updateGeometry();
+#endif
}
@@ -1499,6 +1501,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
switch (message) {
#ifndef Q_WS_WINCE
+#ifndef QT_NO_SESSIONMANAGER
case WM_QUERYENDSESSION: {
if (sm_smActive) // bogus message from windows
RETURN(true);
@@ -1531,6 +1534,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
RETURN(0);
}
+#endif
case WM_DISPLAYCHANGE:
if (QApplication::type() == QApplication::Tty)
break;
@@ -2236,6 +2240,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
}
break;
+#ifndef QT_NO_CONTEXTMENU
case WM_CONTEXTMENU:
{
// it's not VK_APPS or Shift+F10, but a click in the NC area
@@ -2264,6 +2269,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
}
break;
#endif
+#endif
case WM_IME_STARTCOMPOSITION:
case WM_IME_ENDCOMPOSITION: