feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

(Hopefully) fix compilation with Qt5/Mac

Browse Source 
Compilation on mac with latest qt5 fails with

   fatal error: 'QWebSettings' file not found

The compiler call adds "include/QtWebKitWidgets" to include path,
not "include/QtWebKit" . This might be a qmake related issue on mac.
Attempt to fix it by adding an explicit webkit dependency.

Change-Id: I032dd4dda7371a8d477f8544b0ba0004856f3d76
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
This commit is contained in:
Kai Koehne
2012-12-01 23:22:55 +01:00
committed by Pierre Rossi
parent de4fd54c76
commit 61f01c875c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/help.pro
View File

@@ -4,7 +4,7 @@ TARGET = Help
QT += network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += printsupport help
!isEmpty(QT.webkitwidgets.name): QT += webkitwidgets
!isEmpty(QT.webkitwidgets.name): QT += webkitwidgets webkit
else: DEFINES += QT_NO_WEBKIT
} else {
CONFIG += help