diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/painting/qbrush.cpp | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/painting/qbrush.cpp')
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 742a4ea071..05f191dac6 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -48,7 +48,7 @@ #include "qline.h" #include "qdebug.h" #include <QtCore/qcoreapplication.h> -#include "private/qstylehelper_p.h" +#include "private/qhexstring_p.h" #include <QtCore/qnumeric.h> QT_BEGIN_NAMESPACE @@ -706,36 +706,6 @@ void QBrush::setColor(const QColor &c) Sets the brush color to the given \a color. */ - -#ifdef QT3_SUPPORT - -/*! - \fn void QBrush::setPixmap(const QPixmap &pixmap) - - \compat - - Sets a custom pattern for this brush. - - Use setTexture() instead. -*/ - -/*! - \fn QPixmap *QBrush::pixmap() const - - Returns a pointer to the custom brush pattern. - - Use texture() instead. -*/ -QPixmap *QBrush::pixmap() const -{ - if (d->style != Qt::TexturePattern) - return 0; - QTexturedBrushData *data = static_cast<QTexturedBrushData*>(d.data()); - QPixmap &pixmap = data->pixmap(); - return pixmap.isNull() ? 0 : &pixmap; -} -#endif - /*! \fn QPixmap QBrush::texture() const |