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/xlib/qxlibdisplay.cpp | |
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/xlib/qxlibdisplay.cpp')
-rw-r--r-- | src/plugins/platforms/xlib/qxlibdisplay.cpp | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/src/plugins/platforms/xlib/qxlibdisplay.cpp b/src/plugins/platforms/xlib/qxlibdisplay.cpp new file mode 100644 index 0000000..d8aa230 --- /dev/null +++ b/src/plugins/platforms/xlib/qxlibdisplay.cpp @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qxlibdisplay.h" + +QXlibDisplay::QXlibDisplay(Display *display) + : mDisplay(display) +{ + if (!mDisplay) { + qFatal("Cannot connect to X server"); + } + mDisplayName = QString::fromLocal8Bit(DisplayString(mDisplay)); +} + +QXlibDisplay::~QXlibDisplay() +{ + XCloseDisplay(mDisplay); +} + +QString QXlibDisplay::displayName() const +{ + { return mDisplayName; } +} + + + +Display * QXlibDisplay::nativeDisplay() const +{ + return mDisplay; +} + +void QXlibDisplay::sync() const +{ + XSync(mDisplay, False); +} + +void QXlibDisplay::flush() const +{ + XFlush(mDisplay); +} |