diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-05 10:01:20 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-05 10:01:20 (GMT) |
commit | 1f682526eba54d47deddfac38c37a2bf6e26be66 (patch) | |
tree | f745f606edec4f5c049214c04e2f18c08a489e21 /src/gui/kernel | |
parent | 719e22c7fd34112460cddecb1491c3575c5a8c86 (diff) | |
parent | dc2f700a006d827db0eaf8d1e01e4d9c7c8c0baa (diff) | |
download | Qt-1f682526eba54d47deddfac38c37a2bf6e26be66.zip Qt-1f682526eba54d47deddfac38c37a2bf6e26be66.tar.gz Qt-1f682526eba54d47deddfac38c37a2bf6e26be66.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Rename example component file for clarity
Improve docs on QML Animation page and associated elements
Fix warning from whining complier.
Re-enable script program caching on Symbian (used to be disabled due to crash problems that no longer occur).
Increase drag distance on Symbian to improve finger usability on capacitive screens
Increase maximum heap size of QML Viewer
Add missing test file.
Make sure onFocusChanged is correctly emitted for items in a FocusScope.
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 3303800..e164baf 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -474,7 +474,7 @@ int qt_antialiasing_threshold = -1; static int drag_time = 500; #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 = 8; +static int drag_distance = 12; #else static int drag_distance = 4; #endif |