diff options
| author | Alexis Menard <alexis.menard@openbossa.org> | 2011-07-01 13:20:15 -0300 |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2011-07-01 13:53:08 -0300 |
| commit | b843a8616bc8a8087f1a69f18e5118324e92eab2 (patch) | |
| tree | 38600f7e28d32874576ec5e0694dff51d75697c2 /snowshoe.pro | |
| parent | 1e0253821fbb51a075a65d862b982c277e01b52a (diff) | |
| download | snowshoe-b843a8616bc8a8087f1a69f18e5118324e92eab2.tar.gz | |
Support shadow build of QtWebKit.
Also fix some link/build issues if the Qt used contains already a QtWebKit.
Reviewed-By : Andreas Kling
Diffstat (limited to 'snowshoe.pro')
| -rw-r--r-- | snowshoe.pro | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/snowshoe.pro b/snowshoe.pro index 62a23b6..d3311e2 100644 --- a/snowshoe.pro +++ b/snowshoe.pro @@ -25,9 +25,15 @@ WEBKIT_SOURCE_DIR = $$(WEBKIT_SOURCE_DIR) isEmpty(WEBKIT_SOURCE_DIR) { error(Please set WEBKIT_SOURCE_DIR environment variable) } else { - message(Using WebKit from $$WEBKIT_SOURCE_DIR) + message(Using WebKit source from $$WEBKIT_SOURCE_DIR) } -WEBKIT_BUILD_DIR = $$WEBKIT_SOURCE_DIR/WebKitBuild/Release + +WEBKIT_BUILD_DIR = $$(WEBKIT_BUILD_DIR) +isEmpty(WEBKIT_BUILD_DIR) { + WEBKIT_BUILD_DIR = $$WEBKIT_SOURCE_DIR/WebKitBuild/Release +} + +message(Using WebKit build from $$WEBKIT_BUILD_DIR) INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/ INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit2/UIProcess/API/qt @@ -38,10 +44,13 @@ INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit/qt/Api INCLUDEPATH += $$WEBKIT_BUILD_DIR/include/ INCLUDEPATH += $$WEBKIT_BUILD_DIR/include/WebKit2 +# WebKit needs to be the first, just in case the Qt build contains already a QtWebKit. +QMAKE_LFLAGS = -L$$WEBKIT_BUILD_DIR/lib $$QMAKE_LFLAGS + macx { - QMAKE_LFLAGS += -F$$WEBKIT_BUILD_DIR/lib/ LIBS += -framework QtWebKit } else { - LIBS += -L$$WEBKIT_BUILD_DIR/lib + # Make sure that again the custom WebKit is the first in the rpath otherwise it will not pick the right one. + unix : QMAKE_RPATHDIR = $$WEBKIT_BUILD_DIR/lib $$QMAKE_RPATHDIR LIBS += -lQtWebKit } |