diff options
author | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
commit | 8de064f6e96f960cdbfe6868d9957a4613f704df (patch) | |
tree | 4e73a420991733450d013529c0fee60e0365297a /abs/core/qtwebkit/qwebview.patch | |
parent | 0374b16f1e15ba1819b62bd5a6e0076ac7b243d0 (diff) | |
parent | 6fde8cd5e74f0840e01988e743464fe91c0a28f8 (diff) | |
download | linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.zip linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.gz linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.bz2 |
Merge branch 'testing'
Diffstat (limited to 'abs/core/qtwebkit/qwebview.patch')
-rw-r--r-- | abs/core/qtwebkit/qwebview.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/abs/core/qtwebkit/qwebview.patch b/abs/core/qtwebkit/qwebview.patch new file mode 100644 index 0000000..066bc79 --- /dev/null +++ b/abs/core/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 += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include ++LIBS += -L../../../../../../qtwebkit-2.3.4/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 |