summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-09 16:04:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-09 16:04:21 (GMT)
commitbb7b62f3cb7aca178a9e5e65263d0a4a8d40829c (patch)
tree063b724a9b17c814c49b2ead876d795e0f559db7 /tools
parent1e9b107b082282d4aadcffedcd67cb7e5e56aef8 (diff)
parentdc6b5702e0c488bf51ca029290eb65604bfb1dd5 (diff)
downloadQt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.zip
Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.gz
Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tools')
-rw-r--r--tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp b/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp
index 0ab272f..b833e31 100644
--- a/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp
@@ -65,4 +65,4 @@ QEvent::Type QMeeGoSwitchEvent::eventNumber()
switchEventNumber = QEvent::registerEventType();
return (QEvent::Type) switchEventNumber;
-} \ No newline at end of file
+}