Skip to content

Commit

Permalink
QtWebKit 2.0 declare a meta type for QWebElement
Browse files Browse the repository at this point in the history
Fix the compilation of Arora with QtWebKit 2.0. QtWebKit 2 already
declare the meta type, declaring it in Arora results in a clash of
symbols.
  • Loading branch information
Benjamin Poulain committed May 7, 2010
1 parent 82b0de1 commit 5ca8d4b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/webview.cpp
Expand Up @@ -87,7 +87,9 @@
#include <qwebframe.h>

#if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK)
#if !defined(QTWEBKIT_VERSION) || QTWEBKIT_VERSION < 0x020000
Q_DECLARE_METATYPE(QWebElement)
#endif
#include <qinputdialog.h>
#include <qlabel.h>
#include <qmessagebox.h>
Expand Down

0 comments on commit 5ca8d4b

Please sign in to comment.