diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-08 07:36:10 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-08 07:36:10 (GMT) |
| commit | f23f25e576e05a8f6a37930310e2af82b5d4b196 (patch) | |
| tree | a70482b00267d8703395d4331b7166a992395cc8 /tools | |
| parent | 95b17fbe91eb3b1b0fcac92d8a8934769e4cd847 (diff) | |
| parent | 21b357d4e11eee2374d08a70706ced2f964fc5c6 (diff) | |
| download | Qt-f23f25e576e05a8f6a37930310e2af82b5d4b196.zip Qt-f23f25e576e05a8f6a37930310e2af82b5d4b196.tar.gz Qt-f23f25e576e05a8f6a37930310e2af82b5d4b196.tar.bz2 | |
Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
mkspecs/features/qttest_p4.prf
src/script/utils/qscriptdate.cpp
src/script/utils/qscriptdate_p.h
tests/auto/qscriptvalue/testgen/testgenerator.cpp
tests/auto/qscriptvalue/tst_qscriptvalue_generated.cpp
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp | 2 |
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 +} |