diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-21 12:56:26 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-21 12:57:19 (GMT) |
| commit | 4bc894400ffb4ad07babe9b45ed53ceb2d986418 (patch) | |
| tree | 471e6ae18a3164d718bb6a96a23014fd23fc1637 /src/3rdparty/webkit/WebKit/qt/declarative | |
| parent | cf3b0c21a480f4008ba6a53fbab47104299cea8c (diff) | |
| download | Qt-4bc894400ffb4ad07babe9b45ed53ceb2d986418.zip Qt-4bc894400ffb4ad07babe9b45ed53ceb2d986418.tar.gz Qt-4bc894400ffb4ad07babe9b45ed53ceb2d986418.tar.bz2 | |
Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d
Integrated changes:
|| <https://webkit.org/b/40714> || [Qt] Compilation in QWebPagePrivate::timerEvent with clang ||
|| <https://webkit.org/b/40717> || [Qt] Bridge documentation: some snippets have the wrong indentation ||
|| <https://webkit.org/b/40662> || [Qt] Avoid truncation of zoom factor in QWebFrame's print function. ||
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/declarative')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro index 924329a..122d90a 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro +++ b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro @@ -34,17 +34,19 @@ include(../../../WebKit.pri) QT += declarative -linux-* { - # From Creator's src/rpath.pri: - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR - MY_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' - QMAKE_RPATHDIR = -} else { - QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR +!CONFIG(standalone_package) { + linux-* { + # From Creator's src/rpath.pri: + # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR + # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. + QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR + MY_RPATH = $$join(QMAKE_RPATHDIR, ":") + + QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' + QMAKE_RPATHDIR = + } else { + QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR + } } SOURCES += qdeclarativewebview.cpp plugin.cpp |