summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xlib
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-02-14 13:00:14 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-02-14 13:39:19 (GMT)
commit5cda0ff17d82197de987b1c09959549995737b9c (patch)
tree1bbf89bba69ca5b08c9da91ecd38751815e3cdba /src/plugins/platforms/xlib
parent29e009b19593bb42c65fd3a7e6646e929c514b44 (diff)
downloadQt-5cda0ff17d82197de987b1c09959549995737b9c.zip
Qt-5cda0ff17d82197de987b1c09959549995737b9c.tar.gz
Qt-5cda0ff17d82197de987b1c09959549995737b9c.tar.bz2
Lighthouse: fix qxlib include files after file-rename
Diffstat (limited to 'src/plugins/platforms/xlib')
-rw-r--r--src/plugins/platforms/xlib/main.cpp2
-rw-r--r--src/plugins/platforms/xlib/qglxintegration.cpp4
-rw-r--r--src/plugins/platforms/xlib/qglxintegration.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibclipboard.cpp8
-rw-r--r--src/plugins/platforms/xlib/qxlibclipboard.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibcursor.cpp8
-rw-r--r--src/plugins/platforms/xlib/qxlibcursor.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibeglintegration.cpp2
-rw-r--r--src/plugins/platforms/xlib/qxlibeglintegration.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibintegration.cpp10
-rw-r--r--src/plugins/platforms/xlib/qxlibintegration.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibkeyboard.cpp4
-rw-r--r--src/plugins/platforms/xlib/qxlibkeyboard.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibmime.cpp6
-rw-r--r--src/plugins/platforms/xlib/qxlibmime.h4
-rw-r--r--src/plugins/platforms/xlib/qxlibscreen.cpp12
-rw-r--r--src/plugins/platforms/xlib/qxlibscreen.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibstatic.cpp4
-rw-r--r--src/plugins/platforms/xlib/qxlibwindow.cpp12
-rw-r--r--src/plugins/platforms/xlib/qxlibwindow.h2
-rw-r--r--src/plugins/platforms/xlib/qxlibwindowsurface.cpp8
-rw-r--r--src/plugins/platforms/xlib/xlib.pro42
22 files changed, 71 insertions, 71 deletions
diff --git a/src/plugins/platforms/xlib/main.cpp b/src/plugins/platforms/xlib/main.cpp
index 131d399..3e2a6b9 100644
--- a/src/plugins/platforms/xlib/main.cpp
+++ b/src/plugins/platforms/xlib/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <QtGui/QPlatformIntegrationPlugin>
-#include "qtestliteintegration.h"
+#include "qxlibintegration.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp
index 46dfef9..5ba4f0d 100644
--- a/src/plugins/platforms/xlib/qglxintegration.cpp
+++ b/src/plugins/platforms/xlib/qglxintegration.cpp
@@ -43,8 +43,8 @@
#include <QLibrary>
#include <QGLFormat>
-#include "qtestlitewindow.h"
-#include "qtestlitescreen.h"
+#include "qxlibwindow.h"
+#include "qxlibscreen.h"
#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
#include <X11/Xlib.h>
diff --git a/src/plugins/platforms/xlib/qglxintegration.h b/src/plugins/platforms/xlib/qglxintegration.h
index f982708..81b48c9 100644
--- a/src/plugins/platforms/xlib/qglxintegration.h
+++ b/src/plugins/platforms/xlib/qglxintegration.h
@@ -42,7 +42,7 @@
#ifndef Q_GLX_CONTEXT_H
#define Q_GLX_CONTEXT_H
-#include "qtestlitewindow.h"
+#include "qxlibwindow.h"
#include <QtGui/QPlatformGLContext>
#include <QtGui/QPlatformWindowFormat>
diff --git a/src/plugins/platforms/xlib/qxlibclipboard.cpp b/src/plugins/platforms/xlib/qxlibclipboard.cpp
index 1264b5a..7930fcb 100644
--- a/src/plugins/platforms/xlib/qxlibclipboard.cpp
+++ b/src/plugins/platforms/xlib/qxlibclipboard.cpp
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#include "qtestliteclipboard.h"
+#include "qxlibclipboard.h"
-#include "qtestlitescreen.h"
-#include "qtestlitemime.h"
+#include "qxlibscreen.h"
+#include "qxlibmime.h"
#include <private/qapplication_p.h>
@@ -673,4 +673,4 @@ QByteArray QXlibClipboard::getDataInFormat(Atom modeAtom, Atom fmtatom)
return buf;
}
-#include "qtestliteclipboard.moc"
+#include "qxlibclipboard.moc"
diff --git a/src/plugins/platforms/xlib/qxlibclipboard.h b/src/plugins/platforms/xlib/qxlibclipboard.h
index 109714c..ec1d728 100644
--- a/src/plugins/platforms/xlib/qxlibclipboard.h
+++ b/src/plugins/platforms/xlib/qxlibclipboard.h
@@ -43,7 +43,7 @@
#define QTESTLITECLIPBOARD_H
#include <QPlatformClipboard>
-#include "qtestlitestaticinfo.h"
+#include "qxlibstatic.h"
class QXlibScreen;
class QXlibClipboard : public QPlatformClipboard
diff --git a/src/plugins/platforms/xlib/qxlibcursor.cpp b/src/plugins/platforms/xlib/qxlibcursor.cpp
index 2f7cfbf..e4d248c 100644
--- a/src/plugins/platforms/xlib/qxlibcursor.cpp
+++ b/src/plugins/platforms/xlib/qxlibcursor.cpp
@@ -39,11 +39,11 @@
**
****************************************************************************/
-#include "qtestlitecursor.h"
+#include "qxlibcursor.h"
-#include "qtestliteintegration.h"
-#include "qtestlitescreen.h"
-#include "qtestlitewindow.h"
+#include "qxlibintegration.h"
+#include "qxlibscreen.h"
+#include "qxlibwindow.h"
#include <QtGui/QBitmap>
diff --git a/src/plugins/platforms/xlib/qxlibcursor.h b/src/plugins/platforms/xlib/qxlibcursor.h
index db9f9e2..77c66bf 100644
--- a/src/plugins/platforms/xlib/qxlibcursor.h
+++ b/src/plugins/platforms/xlib/qxlibcursor.h
@@ -44,7 +44,7 @@
#include <QtGui/QPlatformCursor>
-#include "qtestliteintegration.h"
+#include "qxlibintegration.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xlib/qxlibeglintegration.cpp b/src/plugins/platforms/xlib/qxlibeglintegration.cpp
index 9bbe0ca..1135d2f 100644
--- a/src/plugins/platforms/xlib/qxlibeglintegration.cpp
+++ b/src/plugins/platforms/xlib/qxlibeglintegration.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qtestliteeglintegration.h"
+#include "qxlibeglintegration.h"
static int countBits(unsigned long mask)
{
diff --git a/src/plugins/platforms/xlib/qxlibeglintegration.h b/src/plugins/platforms/xlib/qxlibeglintegration.h
index 4c2e50d..6a94b8e 100644
--- a/src/plugins/platforms/xlib/qxlibeglintegration.h
+++ b/src/plugins/platforms/xlib/qxlibeglintegration.h
@@ -42,7 +42,7 @@
#ifndef QTESTLITEEGLINTEGRATION_H
#define QTESTLITEEGLINTEGRATION_H
-#include "qtestlitestaticinfo.h"
+#include "qxlibstatic.h"
#include "../eglconvenience/qeglconvenience.h"
class QXlibEglIntegration
diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp
index cdc5c29..46eabbf 100644
--- a/src/plugins/platforms/xlib/qxlibintegration.cpp
+++ b/src/plugins/platforms/xlib/qxlibintegration.cpp
@@ -39,15 +39,15 @@
**
****************************************************************************/
-#include "qtestliteintegration.h"
-#include "qtestlitewindowsurface.h"
+#include "qxlibintegration.h"
+#include "qxlibwindowsurface.h"
#include <QtGui/private/qpixmap_raster_p.h>
#include <QtCore/qdebug.h>
-#include "qtestlitewindow.h"
+#include "qxlibwindow.h"
#include "qgenericunixfontdatabase.h"
-#include "qtestlitescreen.h"
-#include "qtestliteclipboard.h"
+#include "qxlibscreen.h"
+#include "qxlibclipboard.h"
#if !defined(QT_NO_OPENGL)
#if !defined(QT_OPENGL_ES_2)
diff --git a/src/plugins/platforms/xlib/qxlibintegration.h b/src/plugins/platforms/xlib/qxlibintegration.h
index c3125b8..dd8cdec 100644
--- a/src/plugins/platforms/xlib/qxlibintegration.h
+++ b/src/plugins/platforms/xlib/qxlibintegration.h
@@ -48,7 +48,7 @@
#include <QtGui/QPlatformIntegration>
#include <QtGui/QPlatformScreen>
-#include "qtestlitestaticinfo.h"
+#include "qxlibstatic.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xlib/qxlibkeyboard.cpp b/src/plugins/platforms/xlib/qxlibkeyboard.cpp
index fb0cf2e..65727a4 100644
--- a/src/plugins/platforms/xlib/qxlibkeyboard.cpp
+++ b/src/plugins/platforms/xlib/qxlibkeyboard.cpp
@@ -39,9 +39,9 @@
**
****************************************************************************/
-#include "qtestlitekeyboard.h"
+#include "qxlibkeyboard.h"
-#include "qtestlitescreen.h"
+#include "qxlibscreen.h"
#include <QtGui/QWindowSystemInterface>
diff --git a/src/plugins/platforms/xlib/qxlibkeyboard.h b/src/plugins/platforms/xlib/qxlibkeyboard.h
index 98df4e1..02fc290 100644
--- a/src/plugins/platforms/xlib/qxlibkeyboard.h
+++ b/src/plugins/platforms/xlib/qxlibkeyboard.h
@@ -42,7 +42,7 @@
#ifndef QTESTLITEKEYBOARD_H
#define QTESTLITEKEYBOARD_H
-#include "qtestliteintegration.h"
+#include "qxlibintegration.h"
class QXlibKeyboard
{
diff --git a/src/plugins/platforms/xlib/qxlibmime.cpp b/src/plugins/platforms/xlib/qxlibmime.cpp
index 5335ae9..61a0735 100644
--- a/src/plugins/platforms/xlib/qxlibmime.cpp
+++ b/src/plugins/platforms/xlib/qxlibmime.cpp
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#include "qtestlitemime.h"
+#include "qxlibmime.h"
-#include "qtestlitestaticinfo.h"
-#include "qtestlitescreen.h"
+#include "qxlibstatic.h"
+#include "qxlibscreen.h"
#include <QtCore/QTextCodec>
#include <QtGui/QImageWriter>
diff --git a/src/plugins/platforms/xlib/qxlibmime.h b/src/plugins/platforms/xlib/qxlibmime.h
index 6a70ea4..316d423 100644
--- a/src/plugins/platforms/xlib/qxlibmime.h
+++ b/src/plugins/platforms/xlib/qxlibmime.h
@@ -46,8 +46,8 @@
#include <QtGui/QClipboard>
-#include "qtestliteintegration.h"
-#include "qtestliteclipboard.h"
+#include "qxlibintegration.h"
+#include "qxlibclipboard.h"
class QXlibMime : public QInternalMimeData {
Q_OBJECT
diff --git a/src/plugins/platforms/xlib/qxlibscreen.cpp b/src/plugins/platforms/xlib/qxlibscreen.cpp
index 714c17b..ef04fb2 100644
--- a/src/plugins/platforms/xlib/qxlibscreen.cpp
+++ b/src/plugins/platforms/xlib/qxlibscreen.cpp
@@ -39,13 +39,13 @@
**
****************************************************************************/
-#include "qtestlitescreen.h"
+#include "qxlibscreen.h"
-#include "qtestlitecursor.h"
-#include "qtestlitewindow.h"
-#include "qtestlitekeyboard.h"
-#include "qtestlitestaticinfo.h"
-#include "qtestliteclipboard.h"
+#include "qxlibcursor.h"
+#include "qxlibwindow.h"
+#include "qxlibkeyboard.h"
+#include "qxlibstatic.h"
+#include "qxlibclipboard.h"
#include <QtCore/QDebug>
#include <QtCore/QSocketNotifier>
diff --git a/src/plugins/platforms/xlib/qxlibscreen.h b/src/plugins/platforms/xlib/qxlibscreen.h
index 7e59a59..c8043fb 100644
--- a/src/plugins/platforms/xlib/qxlibscreen.h
+++ b/src/plugins/platforms/xlib/qxlibscreen.h
@@ -43,7 +43,7 @@
#define QTESTLITESCREEN_H
#include <QtGui/QPlatformScreen>
-#include "qtestliteintegration.h"
+#include "qxlibintegration.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp
index 837636c..3ce5768 100644
--- a/src/plugins/platforms/xlib/qxlibstatic.cpp
+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#include "qtestlitestaticinfo.h"
-#include "qtestlitescreen.h"
+#include "qxlibstatic.h"
+#include "qxlibscreen.h"
#include <qplatformdefs.h>
diff --git a/src/plugins/platforms/xlib/qxlibwindow.cpp b/src/plugins/platforms/xlib/qxlibwindow.cpp
index 0f11a81..ddd4002 100644
--- a/src/plugins/platforms/xlib/qxlibwindow.cpp
+++ b/src/plugins/platforms/xlib/qxlibwindow.cpp
@@ -39,12 +39,12 @@
**
****************************************************************************/
-#include "qtestlitewindow.h"
+#include "qxlibwindow.h"
-#include "qtestliteintegration.h"
-#include "qtestlitescreen.h"
-#include "qtestlitekeyboard.h"
-#include "qtestlitestaticinfo.h"
+#include "qxlibintegration.h"
+#include "qxlibscreen.h"
+#include "qxlibkeyboard.h"
+#include "qxlibstatic.h"
#include <QtGui/QWindowSystemInterface>
#include <QSocketNotifier>
@@ -60,7 +60,7 @@
#else
#include "../eglconvenience/qeglconvenience.h"
#include "../eglconvenience/qeglplatformcontext.h"
-#include "qtestliteeglintegration.h"
+#include "qxlibeglintegration.h"
#endif //QT_OPENGL_ES_2
#endif //QT_NO_OPENGL
diff --git a/src/plugins/platforms/xlib/qxlibwindow.h b/src/plugins/platforms/xlib/qxlibwindow.h
index ccf6867..be98032 100644
--- a/src/plugins/platforms/xlib/qxlibwindow.h
+++ b/src/plugins/platforms/xlib/qxlibwindow.h
@@ -42,7 +42,7 @@
#ifndef QTESTLITEWINDOW_H
#define QTESTLITEWINDOW_H
-#include "qtestliteintegration.h"
+#include "qxlibintegration.h"
#include <QPlatformWindow>
#include <QEvent>
diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
index 088730d..92e1793 100644
--- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
@@ -39,14 +39,14 @@
**
****************************************************************************/
-#include "qtestlitewindowsurface.h"
-#include "qtestliteintegration.h"
+#include "qxlibwindowsurface.h"
+#include "qxlibintegration.h"
#include <QtCore/qdebug.h>
#include <QWindowSystemInterface>
-#include "qtestlitewindow.h"
-#include "qtestlitescreen.h"
+#include "qxlibwindow.h"
+#include "qxlibscreen.h"
# include <sys/ipc.h>
# include <sys/shm.h>
diff --git a/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro
index 7fb3304..999621b 100644
--- a/src/plugins/platforms/xlib/xlib.pro
+++ b/src/plugins/platforms/xlib/xlib.pro
@@ -1,30 +1,30 @@
-TARGET = qtestlite
+TARGET = qxlib
include(../../qpluginbase.pri)
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
SOURCES = \
main.cpp \
- qtestliteintegration.cpp \
- qtestlitewindowsurface.cpp \
- qtestlitewindow.cpp \
- qtestlitecursor.cpp \
- qtestlitescreen.cpp \
- qtestlitekeyboard.cpp \
- qtestliteclipboard.cpp \
- qtestlitemime.cpp \
- qtestlitestaticinfo.cpp
+ qxlibintegration.cpp \
+ qxlibwindowsurface.cpp \
+ qxlibwindow.cpp \
+ qxlibcursor.cpp \
+ qxlibscreen.cpp \
+ qxlibkeyboard.cpp \
+ qxlibclipboard.cpp \
+ qxlibmime.cpp \
+ qxlibstatic.cpp
HEADERS = \
- qtestliteintegration.h \
- qtestlitewindowsurface.h \
- qtestlitewindow.h \
- qtestlitecursor.h \
- qtestlitescreen.h \
- qtestlitekeyboard.h \
- qtestliteclipboard.h \
- qtestlitemime.h \
- qtestlitestaticinfo.h
+ qxlibintegration.h \
+ qxlibwindowsurface.h \
+ qxlibwindow.h \
+ qxlibcursor.h \
+ qxlibscreen.h \
+ qxlibkeyboard.h \
+ qxlibclipboard.h \
+ qxlibmime.h \
+ qxlibstatic.h
LIBS += -lX11 -lXext
@@ -43,12 +43,12 @@ contains(QT_CONFIG, opengl) {
HEADERS += \
../eglconvenience/qeglplatformcontext.h \
../eglconvenience/qeglconvenience.h \
- qtestliteeglintegration.h
+ qxlibeglintegration.h
SOURCES += \
../eglconvenience/qeglplatformcontext.cpp \
../eglconvenience/qeglconvenience.cpp \
- qtestliteeglintegration.cpp
+ qxlibeglintegration.cpp
LIBS += -lEGL
}
}