diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-25 10:08:30 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-25 10:08:30 +0100 |
commit | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (patch) | |
tree | 35a12d280fa79d40862ced37a5908a566e1bdc39 /extra/qtwebkit/qwebview.patch | |
parent | 0a91993304168ce808fbb7eca986e03262ccb692 (diff) | |
parent | 32793d9a5b60ef0591c71c12ad75121d9b155adf (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/newsbeuter/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/ruby-ncurses/PKGBUILD
community/subtle/PKGBUILD
extra/gegl/PKGBUILD
extra/libebml/PKGBUILD
extra/libmatroska/PKGBUILD
extra/ncmpc/PKGBUILD
extra/nx/PKGBUILD
extra/qtwebkit/PKGBUILD
Diffstat (limited to 'extra/qtwebkit/qwebview.patch')
-rw-r--r-- | extra/qtwebkit/qwebview.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch new file mode 100644 index 000000000..98f6f0f03 --- /dev/null +++ b/extra/qtwebkit/qwebview.patch @@ -0,0 +1,21 @@ +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 +@@ -1,3 +1,6 @@ ++INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include ++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib ++ + CONFIG += designer + win32|mac: CONFIG+= debug_and_release + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 +@@ -2,9 +2,4 @@ + CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) +-contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt +-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview +-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview |