summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-03-08 13:26:44 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-03-08 16:09:36 (GMT)
commit3eb3527db4cfe86ab51506636376d1b59878f42a (patch)
treee22fbeb91d77fa7b5020b32a8156f930cd528c23
parent19231680666727a07270c44153aeb4a68d67de47 (diff)
downloadQt-3eb3527db4cfe86ab51506636376d1b59878f42a.zip
Qt-3eb3527db4cfe86ab51506636376d1b59878f42a.tar.gz
Qt-3eb3527db4cfe86ab51506636376d1b59878f42a.tar.bz2
QGraphcissystemCursor is now in a file with a _ in it
So that syncqt does not generate an entry for it in QtGui
-rw-r--r--src/gui/kernel/qapplication_lite.cpp2
-rw-r--r--src/gui/kernel/qwidget_lite.cpp2
-rw-r--r--src/gui/painting/painting.pri4
-rw-r--r--src/gui/painting/qgraphicssystemcursor_lite.cpp (renamed from src/gui/painting/qgraphicssystemcursor.cpp)2
-rw-r--r--src/gui/painting/qgraphicssystemcursor_lite.h (renamed from src/gui/painting/qgraphicssystemcursor.h)0
-rw-r--r--src/plugins/graphicssystems/fb_base/fb_base.cpp2
-rw-r--r--src/plugins/graphicssystems/fb_base/fb_base.h2
-rw-r--r--src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/kernel/qapplication_lite.cpp b/src/gui/kernel/qapplication_lite.cpp
index 5ca6717..5d7ab5a 100644
--- a/src/gui/kernel/qapplication_lite.cpp
+++ b/src/gui/kernel/qapplication_lite.cpp
@@ -57,7 +57,7 @@
#include <qinputcontext.h>
#include "private/qgraphicssystem_p.h"
-#include "qgraphicssystemcursor.h"
+#include <QGraphicsSystemCursor>
#include <qdebug.h>
#include <QWindowSystemInterface>
diff --git a/src/gui/kernel/qwidget_lite.cpp b/src/gui/kernel/qwidget_lite.cpp
index 3913708..bcbcd82 100644
--- a/src/gui/kernel/qwidget_lite.cpp
+++ b/src/gui/kernel/qwidget_lite.cpp
@@ -48,7 +48,7 @@
#include "private/qapplication_p.h"
#include "qdesktopwidget.h"
-#include "qgraphicssystemcursor.h"
+#include <QGraphicsSystemCursor>
QT_BEGIN_NAMESPACE
static QGraphicsSystemScreen *qt_screenForWidget(const QWidget *w);
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 8fea4e6..8e7bba7 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -183,9 +183,9 @@ embedded_lite {
SOURCES += \
painting/qcolormap_lite.cpp \
painting/qpaintdevice_lite.cpp \
- painting/qgraphicssystemcursor.cpp
+ painting/qgraphicssystemcursor_lite.cpp
HEADERS += \
- painting/qgraphicssystemcursor.h
+ painting/qgraphicssystemcursor_lite.h
}
symbian {
diff --git a/src/gui/painting/qgraphicssystemcursor.cpp b/src/gui/painting/qgraphicssystemcursor_lite.cpp
index f8d24b1..76b7d97 100644
--- a/src/gui/painting/qgraphicssystemcursor.cpp
+++ b/src/gui/painting/qgraphicssystemcursor_lite.cpp
@@ -38,7 +38,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "qgraphicssystemcursor.h"
+#include "qgraphicssystemcursor_lite.h"
#include <QWidget>
#include <QPainter>
diff --git a/src/gui/painting/qgraphicssystemcursor.h b/src/gui/painting/qgraphicssystemcursor_lite.h
index 0d57d52..0d57d52 100644
--- a/src/gui/painting/qgraphicssystemcursor.h
+++ b/src/gui/painting/qgraphicssystemcursor_lite.h
diff --git a/src/plugins/graphicssystems/fb_base/fb_base.cpp b/src/plugins/graphicssystems/fb_base/fb_base.cpp
index 6567e95..da7ddb8 100644
--- a/src/plugins/graphicssystems/fb_base/fb_base.cpp
+++ b/src/plugins/graphicssystems/fb_base/fb_base.cpp
@@ -3,7 +3,7 @@
#include <qpainter.h>
#include <qdebug.h>
#include <qbitmap.h>
-#include <qgraphicssystemcursor.h>
+#include <QGraphicsSystemCursor>
#include <QWindowSystemInterface>
QGraphicsSystemSoftwareCursor::QGraphicsSystemSoftwareCursor(QGraphicsSystemScreen *scr)
diff --git a/src/plugins/graphicssystems/fb_base/fb_base.h b/src/plugins/graphicssystems/fb_base/fb_base.h
index c46a99d..8b130d2 100644
--- a/src/plugins/graphicssystems/fb_base/fb_base.h
+++ b/src/plugins/graphicssystems/fb_base/fb_base.h
@@ -6,7 +6,7 @@
#include <qimage.h>
#include <qtimer.h>
#include <qpainter.h>
-#include <qgraphicssystemcursor.h>
+#include <QGraphicsSystemCursor>
class QMouseEvent;
class QSize;
diff --git a/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp b/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp
index ed8f883..92e0ebc 100644
--- a/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp
+++ b/src/plugins/graphicssystems/testlite/qgraphicssystem_testlite.cpp
@@ -44,7 +44,7 @@
#include <QtGui/private/qpixmap_raster_p.h>
#include <QtCore/qdebug.h>
-#include <qgraphicssystemcursor.h>
+#include <QGraphicsSystemCursor>
#include "x11util.h"