diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-20 10:14:34 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-20 10:14:34 (GMT) |
| commit | 53ce5a08f5a0a4e09ec81486275039afbf76fe3c (patch) | |
| tree | e5b36a597c9bad743d6ac5010c9b71d1415cb2e5 /src | |
| parent | 5508ea53b0af0c580dbf7466bf2731dcbad399de (diff) | |
| download | Qt-53ce5a08f5a0a4e09ec81486275039afbf76fe3c.zip Qt-53ce5a08f5a0a4e09ec81486275039afbf76fe3c.tar.gz Qt-53ce5a08f5a0a4e09ec81486275039afbf76fe3c.tar.bz2 | |
Move qplatformcursor from gui/painting to gui/kernel
Reviewed-by: Jørgen
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/kernel.pri | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.cpp (renamed from src/gui/painting/qplatformcursor_qpa.cpp) | 0 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.h (renamed from src/gui/painting/qplatformcursor_qpa.h) | 0 | ||||
| -rw-r--r-- | src/gui/painting/painting.pri | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 9941b1b..703a1cb 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -221,7 +221,8 @@ qpa { kernel/qplatformwindowformat_qpa.h \ kernel/qplatformglcontext_qpa.h \ kernel/qdesktopwidget_qpa_p.h \ - kernel/qplatformeventloopintegration_qpa.h + kernel/qplatformeventloopintegration_qpa.h \ + painting/qplatformcursor_qpa.h SOURCES += \ kernel/qapplication_qpa.cpp \ @@ -242,7 +243,8 @@ qpa { kernel/qplatformwindow_qpa.cpp \ kernel/qplatformwindowformat_qpa.cpp \ kernel/qplatformeventloopintegration_qpa.cpp \ - kernel/qplatformglcontext_qpa.cpp + kernel/qplatformglcontext_qpa.cpp \ + painting/qplatformcursor_qpa.cpp contains(QT_CONFIG, glib) { SOURCES += \ diff --git a/src/gui/painting/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp index 6665396..6665396 100644 --- a/src/gui/painting/qplatformcursor_qpa.cpp +++ b/src/gui/kernel/qplatformcursor_qpa.cpp diff --git a/src/gui/painting/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h index abdbfee..abdbfee 100644 --- a/src/gui/painting/qplatformcursor_qpa.h +++ b/src/gui/kernel/qplatformcursor_qpa.h diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 1f76b6f..088ad42 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -188,10 +188,7 @@ embedded { qpa { SOURCES += \ painting/qcolormap_qpa.cpp \ - painting/qpaintdevice_qpa.cpp \ - painting/qplatformcursor_qpa.cpp - HEADERS += \ - painting/qplatformcursor_qpa.h + painting/qpaintdevice_qpa.cpp } symbian { |