diff options
Diffstat (limited to 'recipes/webkit/webkit-gtk/WebKit.pri')
| -rw-r--r-- | recipes/webkit/webkit-gtk/WebKit.pri | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/recipes/webkit/webkit-gtk/WebKit.pri b/recipes/webkit/webkit-gtk/WebKit.pri index a869906288..73288abc0f 100644 --- a/recipes/webkit/webkit-gtk/WebKit.pri +++ b/recipes/webkit/webkit-gtk/WebKit.pri @@ -2,21 +2,37 @@ isEmpty(OUTPUT_DIR) { - CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release - CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug + CONFIG(debug, debug|release) { + OUTPUT_DIR=$$PWD/WebKitBuild/Debug + } else { # Release + OUTPUT_DIR=$$PWD/WebKitBuild/Release + } } DEFINES += BUILDING_QT__=1 building-libs { win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 } else { - QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR - LIBS += -lQtWebKit + CONFIG(QTDIR_build) { + QT += webkit + } else { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) { + LIBS += -framework QtWebKit + QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH + } else { + win32-*|wince* { + LIBS += -lQtWebKit$${QT_MAJOR_VERSION} + } else { + LIBS += -lQtWebKit + } + } + } DEPENDPATH += $$PWD/WebKit/qt/Api } DEFINES += USE_SYSTEM_MALLOC -CONFIG(release) { +CONFIG(release, debug|release) { DEFINES += NDEBUG } @@ -34,6 +50,8 @@ INCLUDEPATH += $$PWD/WebKit/qt/Api defineTest(addExtraCompiler) { CONFIG(QTDIR_build) { outputRule = $$eval($${1}.output) + outVariable = $$eval($${1}.variable_out) + !isEqual(outVariable,GENERATED_SOURCES):return(true) input = $$eval($${1}.input) input = $$eval($$input) |