diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-18 00:57:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-18 00:57:59 (GMT) |
| commit | 5134b700b7311e39b25bd783f213e374de5efaaa (patch) | |
| tree | 80f7e31ed771271514dfd403b9e2f70145799772 /src/plugins/platforms/cocoa/qcocoaeventloopintegration.h | |
| parent | 8e26d4b87ad5e2e61d7692af5ee5040caa6ef71a (diff) | |
| parent | ce33fe15dde2151905839196da9927f4c19b18be (diff) | |
| download | Qt-5134b700b7311e39b25bd783f213e374de5efaaa.zip Qt-5134b700b7311e39b25bd783f213e374de5efaaa.tar.gz Qt-5134b700b7311e39b25bd783f213e374de5efaaa.tar.bz2 | |
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (101 commits)
Fixes detected by the static-check
Fixup license headers in Lighthouse plugins
Mac: add autorelease pools to create_sys
Don't skip remaining events on unhandled events in xcb backend.
Lighthouse: Xcb, compile fix for the glx path
Lighthouse: Make sure we don't use xkbcommon
Lighthouse: Add pkg-config check for opengl es2
Rename qnaclunimplemented -> qfunctions_nacl
Rename qconfig-minimal-system-depenencies.h
Add QT_NO_FILESYSTEMITERATOR.
Add QT_NO_DYNAMIC_LIBRARY.
Compile.
NaCl: Dont force release builds.
NaCl: disable libtiff.
posix platformdefs: Add QT_NO_SOCKET_H.
qpnghandler: Compile with QT_NO_IMAGE_TEXT.
Lighthouse: Support Q_NO_CLIPBOARD.
Compile.
Fix CoreServices framework addition for qpa.
Update NaCl mkspecs.
...
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaeventloopintegration.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaeventloopintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaeventloopintegration.h b/src/plugins/platforms/cocoa/qcocoaeventloopintegration.h index 87998e3..81e272e 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventloopintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaeventloopintegration.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 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) ** |