diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 20:02:58 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 20:02:58 +0200 |
| commit | f2a96da63ce8b351232ee6891fc0f664f563a8ba (patch) | |
| tree | 02ff53642dcda4610d69d4d7a227f19131042817 /src/gui/kernel/qapplication.cpp | |
| parent | ffc4b43af90e5a4cb73ac2003a06f78c1d70d435 (diff) | |
| parent | ea6ce3eb29ce41e017d71699b08d10c3eca76b52 (diff) | |
Merge branch 4.7 into qt-master-from-4.7
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 dde10d0b8c..1284947d6e 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -475,11 +475,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 |