diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 14:13:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 14:13:15 (GMT) |
| commit | 84df1620b1b2e648c4980e7186aa1cb060b59729 (patch) | |
| tree | 41f9ae4d031a34cb31dad89cc26ae0d56384bbdc | |
| parent | 2e5edf27acc6eb522d4036de9f82896228887d55 (diff) | |
| parent | f23f25e576e05a8f6a37930310e2af82b5d4b196 (diff) | |
| download | Qt-84df1620b1b2e648c4980e7186aa1cb060b59729.zip Qt-84df1620b1b2e648c4980e7186aa1cb060b59729.tar.gz Qt-84df1620b1b2e648c4980e7186aa1cb060b59729.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed unescaped backslashes in testcase.prf
Fix `make check' for debug-and-release on Windows.
Move `check' target for autotests into testcase.prf
Revert "Backporting TESTARGS feature from 4.7"
Backporting TESTARGS feature from 4.7
Update copyright year to 2011.
embed copyright information in QtAssistantClient4.dll
| -rw-r--r-- | src/network/bearer/qsharednetworksession.cpp | 2 | ||||
| -rw-r--r-- | tools/qmeegographicssystemhelper/qmeegoswitchevent.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/bearer/qsharednetworksession.cpp b/src/network/bearer/qsharednetworksession.cpp index 51b3a32..28ca173 100644 --- a/src/network/bearer/qsharednetworksession.cpp +++ b/src/network/bearer/qsharednetworksession.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** 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 +} |