diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 14:48:03 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 14:55:11 +0200 |
| commit | 100e074126753e43084d69e139d425d373b696b3 (patch) | |
| tree | b89b49327c6e8f286d2b8815df2e9998a31b7f53 /src | |
| parent | 5c16bb8a12dfd07675f61826b1e3fdaf39cca3db (diff) | |
QStylePainter belongs in QtWidgets
Move it into the styles/ directory that will end up
in the QtWidgets library
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/painting.pri | 2 | ||||
| -rw-r--r-- | src/gui/styles/qstylepainter.cpp (renamed from src/gui/painting/qstylepainter.cpp) | 0 | ||||
| -rw-r--r-- | src/gui/styles/qstylepainter.h (renamed from src/gui/painting/qstylepainter.h) | 0 | ||||
| -rw-r--r-- | src/gui/styles/styles.pri | 4 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index c311739a72..4683238ce2 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -35,7 +35,6 @@ HEADERS += \ painting/qrasterizer_p.h \ painting/qregion.h \ painting/qstroker_p.h \ - painting/qstylepainter.h \ painting/qtessellator_p.h \ painting/qtextureglyphcache_p.h \ painting/qtransform.h \ @@ -72,7 +71,6 @@ SOURCES += \ painting/qrasterizer.cpp \ painting/qregion.cpp \ painting/qstroker.cpp \ - painting/qstylepainter.cpp \ painting/qtessellator.cpp \ painting/qtextureglyphcache.cpp \ painting/qtransform.cpp \ diff --git a/src/gui/painting/qstylepainter.cpp b/src/gui/styles/qstylepainter.cpp index c8f9d05315..c8f9d05315 100644 --- a/src/gui/painting/qstylepainter.cpp +++ b/src/gui/styles/qstylepainter.cpp diff --git a/src/gui/painting/qstylepainter.h b/src/gui/styles/qstylepainter.h index 0fc3f2b4b9..0fc3f2b4b9 100644 --- a/src/gui/painting/qstylepainter.h +++ b/src/gui/styles/qstylepainter.h diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri index 35347c24e7..07ba608c47 100644 --- a/src/gui/styles/styles.pri +++ b/src/gui/styles/styles.pri @@ -10,7 +10,8 @@ HEADERS += \ styles/qstylehelper_p.h \ styles/qproxystyle.h \ styles/qproxystyle_p.h \ - styles/qstylesheetstyle_p.h + styles/qstylepainter.h \ + styles/qstylesheetstyle_p.h SOURCES += \ styles/qstyle.cpp \ @@ -20,6 +21,7 @@ SOURCES += \ styles/qstylehelper.cpp \ styles/qcommonstyle.cpp \ styles/qproxystyle.cpp \ + styles/qstylepainter.cpp \ styles/qstylesheetstyle.cpp \ styles/qstylesheetstyle_default.cpp |