From 794feb002ad468bcfa60d1edc55637273fef5832 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 25 Aug 2011 14:36:14 +0200 Subject: [PATCH] Fix exports for widgets. Change-Id: Id505aa13dfd3b34659961e44473abae99d18ee4c Reviewed-on: http://codereview.qt.nokia.com/3597 Reviewed-by: Friedemann Kleint Reviewed-by: Qt Sanity Bot --- src/widgets/accessible/qaccessible2.cpp | 6 +++--- src/widgets/itemviews/qtreeview_p.h | 2 +- src/widgets/widgets/qwidgetlinecontrol_p.h | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/widgets/accessible/qaccessible2.cpp b/src/widgets/accessible/qaccessible2.cpp index 078ff13..896c2c8 100644 --- a/src/widgets/accessible/qaccessible2.cpp +++ b/src/widgets/accessible/qaccessible2.cpp @@ -137,7 +137,7 @@ QT_BEGIN_NAMESPACE /*! \internal */ -QString Q_GUI_EXPORT qTextBeforeOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, +QString Q_WIDGETS_EXPORT qTextBeforeOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, int *startOffset, int *endOffset, const QString& text) { QTextBoundaryFinder::BoundaryType type; @@ -175,7 +175,7 @@ QString Q_GUI_EXPORT qTextBeforeOffsetFromString(int offset, QAccessible2::Bound /*! \internal */ -QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, +QString Q_WIDGETS_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, int *startOffset, int *endOffset, const QString& text) { QTextBoundaryFinder::BoundaryType type; @@ -210,7 +210,7 @@ QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::Bounda /*! \internal */ -QString Q_GUI_EXPORT qTextAtOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, +QString Q_WIDGETS_EXPORT qTextAtOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, int *startOffset, int *endOffset, const QString& text) { QTextBoundaryFinder::BoundaryType type; diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h index a9dc452..5a90b15 100644 --- a/src/widgets/itemviews/qtreeview_p.h +++ b/src/widgets/itemviews/qtreeview_p.h @@ -78,7 +78,7 @@ struct QTreeViewItem Q_DECLARE_TYPEINFO(QTreeViewItem, Q_MOVABLE_TYPE); -class Q_GUI_EXPORT QTreeViewPrivate : public QAbstractItemViewPrivate +class Q_WIDGETS_EXPORT QTreeViewPrivate : public QAbstractItemViewPrivate { Q_DECLARE_PUBLIC(QTreeView) public: diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 2237c27..4169d2d 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -71,6 +71,10 @@ QT_BEGIN_HEADER +#ifdef DrawText +# undef DrawText +#endif + QT_BEGIN_NAMESPACE QT_MODULE(Gui) -- 2.7.4