diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
| commit | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch) | |
| tree | b34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Tools/QtTestBrowser | |
| parent | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff) | |
| download | qtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz | |
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/QtTestBrowser.pro | 5 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/locationedit.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro index 7fbb1e924..1319967d4 100644 --- a/Tools/QtTestBrowser/QtTestBrowser.pro +++ b/Tools/QtTestBrowser/QtTestBrowser.pro @@ -52,7 +52,10 @@ haveQt(5): QT += printsupport widgets contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig -contains(QT_CONFIG, opengl): QT += opengl +contains(QT_CONFIG, opengl) { + QT += opengl + DEFINES += QT_CONFIGURED_WITH_OPENGL +} RESOURCES += \ QtTestBrowser.qrc diff --git a/Tools/QtTestBrowser/locationedit.h b/Tools/QtTestBrowser/locationedit.h index b64474de7..54d8a6835 100644 --- a/Tools/QtTestBrowser/locationedit.h +++ b/Tools/QtTestBrowser/locationedit.h @@ -28,8 +28,6 @@ #ifndef locationedit_h #define locationedit_h -#include <qconfig.h> - #ifndef QT_NO_INPUTDIALOG #include <QApplication> #include <QIcon> |