diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-03-15 13:36:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-15 13:52:36 +0100 |
| commit | 4571a91db39491b97f9d42affb996406c8c3c5f8 (patch) | |
| tree | 6f3ea486a69e4bed2c6996f163f6543d8f539715 | |
| parent | 3db4e05af46453be130a174f08bb7619d858b676 (diff) | |
| download | qtwebkit-4571a91db39491b97f9d42affb996406c8c3c5f8.tar.gz | |
[Qt] Build error with building with Qt 5.1
https://bugs.webkit.org/show_bug.cgi?id=112435
Reviewed by Noam Rosenthal.
QAccessibleWidget has moved to private.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I9a81337a1765682556af34ac7d4a5b1c0c350216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h | 4 | ||||
| -rw-r--r-- | Source/widgetsapi.pri | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h b/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h index 7cbf44870..a17b29ed1 100644 --- a/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h +++ b/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h @@ -22,7 +22,11 @@ #include <qaccessible.h> #include <qaccessibleobject.h> +#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) +#include <private/qaccessiblewidget_p.h> +#else #include <qaccessiblewidget.h> +#endif class QWebFrame; class QWebPage; diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri index b54bc1d53..96db91589 100644 --- a/Source/widgetsapi.pri +++ b/Source/widgetsapi.pri @@ -33,7 +33,7 @@ contains(CONFIG, texmap): DEFINES += WTF_USE_TEXTURE_MAPPER=1 use?(PLUGIN_BACKEND_XLIB): PKGCONFIG += x11 -QT += network widgets +QT += network widgets widgets-private have?(QTQUICK): QT += quick have?(QTPRINTSUPPORT): QT += printsupport |