diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-03-07 11:01:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-10 20:10:51 +0100 |
| commit | 43736f1be8c933d08607f991c6b36f0f332717a0 (patch) | |
| tree | 78c91e3f0dc9e65f31adfb8ff7f0c426593592eb | |
| parent | 6f7a22a98625f7e71e5a301d53682e1be221dd2e (diff) | |
| download | qtwebkit-43736f1be8c933d08607f991c6b36f0f332717a0.tar.gz | |
Fix the webkit build with icu on Mac OS X 10.9.
The QtWebKit build on OS X 10.9 was failing due to the wrong headers
being used for ICU. WebKit uses the system ICU libraries and includes
the headers for this from the WebKit source.
Fixed by changing the include path order for the QtWebKit build.
Task-number: QTBUG-35667
Change-Id: Ic68991535457c1fc318b54f6830de352399dd5c4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/WTF/WTF.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index a9a950012..a2f6aaa1b 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -11,7 +11,7 @@ INCLUDEPATH += $$PWD mac { # Mac OS does ship libicu but not the associated header files. # Therefore WebKit provides adequate header files. - INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WTF/icu + INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH LIBS += -licucore } else { contains(QT_CONFIG,icu) { |