diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 15:14:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 15:15:21 +0200 |
| commit | 08ba97f653cc39073c73f76b7de38b7db311f38e (patch) | |
| tree | 62f81ca7525f061c674638f5b2ba4c5501eea92b /src/gui | |
| parent | aa20a95f5983bdb7c7badb375f46d47e6451fcf8 (diff) | |
qdrawutil is for QtWidgets
the methods don't make sense for QML based apps
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/painting.pri | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpaintengineex_p.h | 1 | ||||
| -rw-r--r-- | src/gui/painting/qpainter.h | 1 | ||||
| -rw-r--r-- | src/gui/styles/qdrawutil.cpp (renamed from src/gui/painting/qdrawutil.cpp) | 0 | ||||
| -rw-r--r-- | src/gui/styles/qdrawutil.h (renamed from src/gui/painting/qdrawutil.h) | 0 | ||||
| -rw-r--r-- | src/gui/styles/styles.pri | 6 |
6 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 4683238ce2..07d4b942b1 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -6,7 +6,6 @@ HEADERS += \ painting/qcolor.h \ painting/qcolor_p.h \ painting/qcolormap.h \ - painting/qdrawutil.h \ painting/qemulationpaintengine_p.h \ painting/qmatrix.h \ painting/qmemrotate_p.h \ @@ -49,7 +48,6 @@ SOURCES += \ painting/qcolor.cpp \ painting/qcolor_p.cpp \ painting/qcssutil.cpp \ - painting/qdrawutil.cpp \ painting/qemulationpaintengine.cpp \ painting/qmatrix.cpp \ painting/qmemrotate.cpp \ diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index d12c602372..d5bef1ef17 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -54,7 +54,6 @@ // #include <QtGui/qpaintengine.h> -#include <QtGui/qdrawutil.h> #include <private/qpaintengine_p.h> #include <private/qstroker_p.h> diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index 9ef39e8ab7..0be3dfcbb3 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -49,7 +49,6 @@ #include <QtGui/qpixmap.h> #include <QtGui/qimage.h> #include <QtGui/qtextoption.h> -#include <QtGui/qdrawutil.h> #ifndef QT_INCLUDE_COMPAT #include <QtGui/qpolygon.h> diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/styles/qdrawutil.cpp index c674da8394..c674da8394 100644 --- a/src/gui/painting/qdrawutil.cpp +++ b/src/gui/styles/qdrawutil.cpp diff --git a/src/gui/painting/qdrawutil.h b/src/gui/styles/qdrawutil.h index f46f720f2c..f46f720f2c 100644 --- a/src/gui/painting/qdrawutil.h +++ b/src/gui/styles/qdrawutil.h diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri index 07ba608c47..b20caf726e 100644 --- a/src/gui/styles/styles.pri +++ b/src/gui/styles/styles.pri @@ -1,7 +1,8 @@ # Qt styles module HEADERS += \ - styles/qstyle.h \ + styles/qdrawutil.h \ + styles/qstyle.h \ styles/qstylefactory.h \ styles/qstyleoption.h \ styles/qstyleplugin.h \ @@ -14,7 +15,8 @@ HEADERS += \ styles/qstylesheetstyle_p.h SOURCES += \ - styles/qstyle.cpp \ + styles/qdrawutil.cpp \ + styles/qstyle.cpp \ styles/qstylefactory.cpp \ styles/qstyleoption.cpp \ styles/qstyleplugin.cpp \ |