diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 11:51:33 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 11:51:33 +0200 |
| commit | 0e3823d30c2294eb11c205ca11fca55508478151 (patch) | |
| tree | 3ce927318590ce3e9e790ee08bc489d3f3f386ec /src/gui/painting | |
| parent | b9798615b43746b26619b7abdad3abf89f6fb2fb (diff) | |
remove dependency to QStyle::visualAlignment
The current position of the code in QGuiAppPrivate
is a bit messy, but we can later on consider
consolidating some of this in some helper
namespace.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 889c2e32a2..dded864827 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -56,7 +56,6 @@ #include "qpixmapcache.h" #include "qpolygon.h" #include "qtextlayout.h" -#include "qstyle.h" #include "qthread.h" #include "qvarlengtharray.h" #include "qstatictext.h" @@ -72,6 +71,7 @@ #include <private/qstatictext_p.h> #include <private/qglyphs_p.h> #include <private/qhexstring_p.h> +#include <private/qguiapplication_p.h> #include <private/qrawfont_p.h> QT_BEGIN_NAMESPACE @@ -7547,7 +7547,7 @@ void qt_format_text(const QFont &fnt, const QRectF &_r, else layout_direction = Qt::LeftToRight; - tf = QStyle::visualAlignment(layout_direction, QFlag(tf)); + tf = QGuiApplicationPrivate::visualAlignment(layout_direction, QFlag(tf)); bool isRightToLeft = layout_direction == Qt::RightToLeft; bool expandtabs = ((tf & Qt::TextExpandTabs) && |