diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
| commit | b4ddf0420db30098274986612ca3e8951ef18e2e (patch) | |
| tree | a85bdad9b92652b09dd613b2172d5b07d4926d4b /src/gui/kernel/qapplication.cpp | |
| parent | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (diff) | |
| parent | e1fead7c4f877308c2cc11131c445a1f7085baf7 (diff) | |
| download | Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.zip Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.gz Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index fdacefc..3323fbc 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -477,11 +477,14 @@ bool Q_GUI_EXPORT qt_tab_all_widgets = true; bool qt_in_tab_key_event = false; int qt_antialiasing_threshold = -1; static int drag_time = 500; +#ifndef QT_GUI_DRAG_DISTANCE +#define QT_GUI_DRAG_DISTANCE 4 +#endif #ifdef Q_OS_SYMBIAN // The screens are a bit too small to for your thumb when using only 4 pixels drag distance. -static int drag_distance = 12; +static int drag_distance = 12; //XXX move to qplatformdefs.h #else -static int drag_distance = 4; +static int drag_distance = QT_GUI_DRAG_DISTANCE; #endif static Qt::LayoutDirection layout_direction = Qt::LeftToRight; QSize QApplicationPrivate::app_strut = QSize(0,0); // no default application strut |