OSDN Git Service

initialize QApplicationPrivate::wheel_scroll_lines to 0 when QT_NO_WHEELEVENT is...
authorIvailo Monev <xakepa10@gmail.com>
Tue, 8 Dec 2020 14:50:18 +0000 (14:50 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 9 Dec 2020 05:01:56 +0000 (05:01 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/kernel/qapplication.cpp

index 65046ad..f95d249 100644 (file)
@@ -358,7 +358,9 @@ int QApplicationPrivate::cursor_flash_time = 1000;        // text caret flash ti
 int QApplicationPrivate::mouse_double_click_time = 400;        // mouse dbl click limit
 int QApplicationPrivate::keyboard_input_time = 400; // keyboard input interval
 #ifndef QT_NO_WHEELEVENT
-int QApplicationPrivate::wheel_scroll_lines;   // number of lines to scroll
+int QApplicationPrivate::wheel_scroll_lines = 3;         // number of lines to scroll
+#else
+int QApplicationPrivate::wheel_scroll_lines = 0;
 #endif
 bool qt_is_gui_used;
 bool qt_in_tab_key_event = false;
@@ -622,10 +624,6 @@ void QApplicationPrivate::construct(
     if (qgetenv("QT_USE_NATIVE_WINDOWS").toInt() > 0)
         q->setAttribute(Qt::AA_NativeWindows);
 
-#ifndef QT_NO_WHEELEVENT
-    QApplicationPrivate::wheel_scroll_lines = 3;
-#endif
-
     if (qt_is_gui_used)
         initializeMultitouch();