diff options
Diffstat (limited to 'src/3rdparty/webkit/WebKit.pri')
| -rw-r--r-- | src/3rdparty/webkit/WebKit.pri | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index 229890c..b363365 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -2,8 +2,11 @@ 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 @@ -14,19 +17,45 @@ building-libs { QT += webkit } else { QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR - LIBS += -lQtWebKit + 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 } BASE_DIR = $$PWD INCLUDEPATH += $$PWD/WebKit/qt/Api +# Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT +*-armcc { + QMAKE_CFLAGS += --gnu + QMAKE_CXXFLAGS += --gnu --no_parse_templates +} + +symbian { + QMAKE_CXXFLAGS.ARMCC += --gnu --no_parse_templates + DEFINES *= QT_NO_UITOOLS +} + +contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools + +# Disable a few warnings on Windows. The warnings are also +# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops +win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4503 -wd4800 -wd4819 -wd4996 + # # For builds inside Qt we interpret the output rule and the input of each extra compiler manually # and add the resulting sources to the SOURCES variable, because the build inside Qt contains already |