38bad67383
The idea to have a separate qt-webkit package which builds with gcc6 is taken from the Arch Linux team's efforts: https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/qtwebkit This addresses #4748 the unsolvable(?) problems when trying to build the shipped qtwebkit that comes with qt-4.7.8 with gcc6.
21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
--- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
|
|
+++ qt-everywhere-opensource-src-4.8.7/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.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
|
|
+++ qt-everywhere-opensource-src-4.8.7/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
|