summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-03 02:07:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-03 02:07:46 (GMT)
commit0367742255f71cae623f35f82392993214bdb7db (patch)
treed667235e28e7f63ed3bee518aa3a3db0c9cbe4fe /mkspecs
parentfbf487762979846452e348b711f27a67c4edbc49 (diff)
parent2ef657cd68aaa790e940f8603085e0647583f5f6 (diff)
downloadQt-0367742255f71cae623f35f82392993214bdb7db.zip
Qt-0367742255f71cae623f35f82392993214bdb7db.tar.gz
Qt-0367742255f71cae623f35f82392993214bdb7db.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/linux-g++-maemo/qplatformdefs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/linux-g++-maemo/qplatformdefs.h b/mkspecs/linux-g++-maemo/qplatformdefs.h
index 7e8d1d4..d7feb9e 100644
--- a/mkspecs/linux-g++-maemo/qplatformdefs.h
+++ b/mkspecs/linux-g++-maemo/qplatformdefs.h
@@ -40,3 +40,5 @@
****************************************************************************/
#include "../linux-g++/qplatformdefs.h"
+
+#define QT_GUI_DOUBLE_CLICK_RADIUS 20