Re: [ptxdist] Qt 5

["Erwin Rol (Mailinglists)" <mailinglists@erwinrol.com>]

[-- Attachment #1: Type: text/plain, Size: 692 bytes --]

I got a "works for me" setup. I only got it to run on a Tegra3 board  
(never tested anything else) and did not spend any time in making it  
"nice" or "clean" , it really is a "works for me" hack (in the hope real  
qt5 support would end up in ptxdist automagicaly :-).

- Erwin



On Wed, 02 Oct 2013 12:36:23 +0200, Matthias Klein  
<matthias.klein@optimeas.de> wrote:

> Hello,
>
> are there any plans about Qt 5 in ptxdist ?
> I saw on the mailinglist that Michael was working on it end 2012.
>
> Can anyone share some rules/patches as a starting point ?
>
>
> Best regards,
>
> Matthias


-- 
Erwin Rol

email: erwin@erwinrol.com
www: www.erwinrol.com
tel: +31-72-5067780
skype: lowlndr

[-- Attachment #2: qt5.in --]
[-- Type: application/octet-stream, Size: 974 bytes --]

## SECTION=qt

menuconfig QT5
	tristate
	select ICU
	select LIBC_PTHREAD
	select LIBC_DL
	select LIBC_RT
	select LIBC_M
	select GCCLIBS_CXX
	select GCCLIBS_GCC_S
	select DBUS
	select GLIB
	select ZLIB	
	select LIBXML2
	select UDEV
	select UDEV_LIBUDEV
	select LIBPNG	
	select LIBJPEG
	select SQLITE
	select GSTREAMER1
	select GST_PLUGINS_BAD1
	select GST_PLUGINS_BASE1
	select GST_PLUGINS_GOOD1
	select GST_PLUGINS_UGLY1

	select OPENSSL
	select MESALIB
	select ALSA_LIB	
	select LIBXCB
	select XCB_PROTO
	select XCB_UTIL

	select XORG_LIB_X11
	select XORG_LIB_SM
	select XORG_PROTO_XEXT	
	select XORG_LIB_XINERAMA
	select XORG_LIB_XCURSOR	
	select XORG_LIB_XFIXES	
	select XORG_LIB_XRANDR
	select XORG_LIB_XRENDER
	select XORG_LIB_XCOMPOSITE
	select FONTCONFIG
	select FREETYPE		
	select XORG_PROTO_INPUT	
	select XORG_LIB_XI
	select XORG_PROTO_KB	
	select XORG_LIB_XKBUI

	prompt "qt 5                          "
	help
	  Qt is a Widget Library for Linux.

if QT5

endif


[-- Attachment #3: qt5.make --]
[-- Type: application/octet-stream, Size: 8817 bytes --]

# -*-makefile-*-
#
# Copyright (C) 2008 by Juergen Beisert
#               2009-2011 by Michael Olbrich <m.olbrich@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
# see the README file.
#

#
# We provide this package
#
PACKAGES-$(PTXCONF_QT5) += qt5

#
# Paths and names
#
QT5_VERSION	:= 5.1.1
QT5_MD5		:=
QT5		:= qt-everywhere-opensource-src-$(QT5_VERSION)
QT5_SUFFIX	:= tar.xz
QT5_URL		:= http://download.qt-project.org/official_releases/qt/5.1/5.1.1/single/$(QT5).$(QT5_SUFFIX)
QT5_SOURCE	:= $(SRCDIR)/$(QT5).$(QT5_SUFFIX)
QT5_DIR		:= $(BUILDDIR)/$(QT5)
QT5_BUILD_OOT	:= YES
QT5_LICENSE	:= GPL3, LGPLv2.1

# ----------------------------------------------------------------------------
# Extract
# ----------------------------------------------------------------------------

GLES2_LIBS	:= -lGLESv2 -lnvapputil -lnvavp -lnvcwm -lnvdc -lnvddk_2d -lnvddk_2d_v2 -lnvddk_disp -lnvddk_kbc -lnvddk_mipihsi -lnvddk_nand -lnvddk_se -lnvddk_snor -lnvddk_spif -lnvddk_usbphy -lnvdispatch_helper -lnvglsi -lnvmedia_audio -lnvmm_audio -lnvmm_camera -lnvmm_contentpipe -lnvmm_image -lnvmmlite_audio -lnvmmlite_image -lnvmmlite -lnvmmlite_utils -lnvmmlite_video -lnvmm_manager -lnvmm_parser -lnvmm_service -lnvmm -lnvmm_video -lnvmm_writer -lnvodm_disp -lnvodm_dtvtuner -lnvodm_imager -lnvodm_misc -lnvodm_query -lnvomxilclient -lnvos -lnvparser -lnvrm_graphics -lnvrm -lnvsm -lnvtestio -lnvtestresults -lnvtvmr -lnvwinsys -lardrv_dynamic -lnvmm_utils -lX11 -lXext -lXau -lxcb -lXdmcp

$(STATEDIR)/qt5.extract:
	@$(call targetinfo)
	@$(call clean, $(QT5_DIR))
	@$(call extract, QT5)
	@$(call patchin, QT5)
	@for file in $(QT5_DIR)/qtbase/mkspecs/devices/linux-ptxdist-g++/*.in; do \
		sed -e "s,@PTXDIST_COMPILER_PREFIX@,$(COMPILER_PREFIX),g" \
			-e "s#@PTXDIST_QT_QPA_DEFAULT_PLATFORM@#xcb#g" \
			-e "s#@PTXDIST_CPPFLAGS@#$(CROSS_CPPFLAGS)#g" \
			-e "s#@PTXDIST_CFLAGS@#$(CROSS_CFLAGS)#g" \
			-e "s#@PTXDIST_CXXFLAGS@#$(CROSS_CXXFLAGS)#g" \
			-e "s#@PTXDIST_INCDIR@#$(SYSROOT)/include $(SYSROOT)/usr/include#g" \
			-e "s#@PTXDIST_LIBDIR@#$(SYSROOT)/lib $(SYSROOT)/usr/lib#g" \
			-e "s#@PTXDIST_LDFLAGS@#$(strip $(CROSS_LDFLAGS))#g" \
			-e "s#@PTXDIST_COMPILER_FLAGS@##g" \
			-e "s#@PTXDIST_QMAKE_CXXFLAGS_RELEASE@#-O3#g" \
			-e "s#@PTXDIST_QMAKE_LIBS@#-lrt -lpthread -ldl#g" \
			-e "s#@PTXDIST_QMAKE_INCDIR_EGL@##g" \
			-e "s#@PTXDIST_QMAKE_LIBDIR_EGL@##g" \
			-e "s#@PTXDIST_QMAKE_INCDIR_OPENGL_ES2@##g" \
			-e "s#@PTXDIST_QMAKE_LIBDIR_OPENGL_ES2@##g" \
			-e "s#@PTXDIST_QMAKE_INCDIR_OPENVG@##g" \
			-e "s#@PTXDIST_QMAKE_LIBDIR_OPENVG@##g" \
			-e "s#@PTXDIST_QMAKE_LIBS_EGL@#-lEGL#g" \
			-e "s#@PTXDIST_QMAKE_LIBS_OPENGL_ES2@#$(GLES2_LIBS)#g" \
			-e "s#@PTXDIST_QMAKE_LIBS_OPENVG@##g" \
		    $$file > $${file%%.in}; \
	done
	@$(call touch)

# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------

# don't use CROSS_ENV. Qt uses mkspecs for instead.
QT5_ENV		:= $(CROSS_ENV_PKG_CONFIG) INSTALL_ROOT=$(QT5_PKGDIR)
QT5_INSTALL_OPT	:= install INSTALL_ROOT=$(QT5_PKGDIR)

#
# autoconf
#
QT5_AUTOCONF := \
	-prefix /usr \
	-hostprefix $(PTXDIST_SYSROOT_CROSS) \
	-device linux-ptxdist-g++ \
	-device-option CROSS_COMPILE=$(COMPILER_PREFIX) \
	-opensource \
	-confirm-license \
	-release \
	-no-rpath \
	-no-sql-ibase \
	-no-sql-mysql \
	-no-sql-odbc \
	-no-sql-psql \
	-no-sql-sqlite2 \
	-no-sse \
	-no-sse2 \
	-no-sse3 \
	-no-ssse3 \
	-no-sse4.1 \
	-no-sse4.2 \
	-no-avx \
	-no-optimized-qmake \
	-no-nis \
	-no-cups \
	-no-pch \
	-reduce-relocations \
	-reduce-exports \
	-force-pkg-config \
	-no-gtkstyle \
	-no-openvg \
	-opengl es2 \
	-shared \
	-no-eglfs \
	-no-directfb \
	-no-linuxfb \
	-no-kms \
	-glib \
	-no-kms \
	-make libs \
	-nomake tools \
	-nomake tests \
	-nomake examples \
	-xcb \
	-c++11 \
	-no-gstreamer

#$(STATEDIR)/qt5.compile:
#	@$(call targetinfo)
#	@$(call touch)

QT5_INSTALL_OPT += install_subtargets

$(STATEDIR)/qt5.install:
	@$(call targetinfo)
	@$(call install, QT5)
	@find "$(QT5_PKGDIR)" -name "*.pri" -print0 | xargs -r -0 -- \
		sed -i -e "s#$(PTXDIST_SYSROOT_TARGET)#\$$\$$(SYSROOT)#g"
	@find "$(QT5_PKGDIR)" -name "*.la" -print0 | xargs -r -0 -- \
		sed -i -e "/^dependency_libs/s:\( \|-L\|-R\)$(QT5_PKGDIR)\(/lib\|/usr/lib\):\1$(SYSROOT)\2:g"
	@find "$(QT5_PKGDIR)" -name "*.prl" -print0 | xargs -r -0 -- \
		sed -i -e "/^QMAKE_PRL_LIBS/s:\( \|-L\|-R\)$(QT5_PKGDIR)\(/lib\|/usr/lib\):\1$(SYSROOT)\2:g"
	@$(call touch)

# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------

$(STATEDIR)/qt5.install.post:
	@$(call targetinfo)
	@$(call world/install.post, QT5)
#       create a cross qmake:
#       copy host qmake and add a qt.conf (these must be in the same dir)
#       add wrapper script that sets the correct QMAKESPEC
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/lrelease
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/moc
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/qdbuscpp2xml
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/qdbusxml2cpp
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/qdoc
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/qmake
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/rcc
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/syncqt
	@rm -f $(PTXDIST_SYSROOT_CROSS)/bin/uic
	@rm -rf $(PTXDIST_SYSROOT_CROSS)/mkspecs/
	@mkdir -p $(PTXDIST_SYSROOT_CROSS)/bin/
	@cp $(QT5_PKGDIR)/$(PTXDIST_SYSROOT_CROSS)/bin/* $(PTXDIST_SYSROOT_CROSS)/bin/
	@cp -a $(QT5_PKGDIR)/$(PTXDIST_SYSROOT_CROSS)/mkspecs/ $(PTXDIST_SYSROOT_CROSS)/mkspecs/
	@echo "[Paths]" > $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf
	@echo "Prefix=$(PTXDIST_SYSROOT_CROSS)" >> $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf
	@echo "Binaries=$(PTXDIST_SYSROOT_CROSS)/bin/" >> $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf
	@echo "Headers=$(SYSROOT)/usr/include/" >> $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf
	@echo "Libraries=$(SYSROOT)/usr/lib/" >> $(PTXDIST_SYSROOT_CROSS)/bin/qt.conf
	@$(call touch)

$(STATEDIR)/qt5.targetinstall:
	@$(call targetinfo)

	@$(call install_init, qt5)
	@$(call install_fixup, qt5,PRIORITY,optional)
	@$(call install_fixup, qt5,SECTION,base)
	@$(call install_fixup, qt5,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
	@$(call install_fixup, qt5,DESCRIPTION,missing)

	@$(call install_lib, qt5, 0, 0, 0644,libQt5CLucene)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Concurrent)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Core)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5DBus)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Declarative)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Gui)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Help)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5MultimediaQuick_p)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Multimedia)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5MultimediaWidgets)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Network)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5OpenGL)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5PrintSupport)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Qml)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5QuickParticles)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Quick)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5QuickTest)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Script)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5ScriptTools)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Sensors)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5SerialPort)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Sql)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Svg)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Test)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5V8)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5WebKit)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5WebKitWidgets)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Widgets)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5X11Extras)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5XmlPatterns)
	@$(call install_lib, qt5, 0, 0, 0644,libQt5Xml)


	@$(call install_tree, qt5, 0, 0, -, /usr/libexec/)
	@$(call install_tree, qt5, 0, 0, -, /usr/plugins/)
	@$(call install_tree, qt5, 0, 0, -, /usr/qml/)
	@$(call install_tree, qt5, 0, 0, -, /usr/imports/)
	@$(call install_tree, qt5, 0, 0, -, /usr/translations/)

	@$(call install_copy, qt5, 0, 0, 0755, -, /usr/bin/qdbus)
	@$(call install_copy, qt5, 0, 0, 0755, -, /usr/bin/qdbusviewer)
	@$(call install_copy, qt5, 0, 0, 0755, -, /usr/bin/qmlbundle)
	@$(call install_copy, qt5, 0, 0, 0755, -, /usr/bin/qmlscene)
	@$(call install_copy, qt5, 0, 0, 0755, -, /usr/bin/qmltestrunner)
	@$(call install_copy, qt5, 0, 0, 0755, -, /usr/bin/xmlpatterns)
	@$(call install_copy, qt5, 0, 0, 0755, -, /usr/bin/xmlpatternsvalidator)


	@$(call install_finish, qt5)

	@$(call touch)

# vim: syntax=make

[-- Attachment #4: pc_file_gen.diff --]
[-- Type: application/octet-stream, Size: 818 bytes --]

--- qt-everywhere-opensource-src-5.1.1/qtbase/qmake/generators/makefile.cpp.orig	2013-09-16 17:20:20.173372048 +0200
+++ qt-everywhere-opensource-src-5.1.1/qtbase/qmake/generators/makefile.cpp	2013-09-16 17:26:25.743082549 +0200
@@ -3270,7 +3270,10 @@
         pkgConfiglibName = "-framework " + bundle + " ";
     } else {
         pkgConfiglibDir = "-L${libdir}";
-        pkgConfiglibName = "-l" + fileInfo(fname).completeBaseName();
+        if ((fileInfo(fname).completeBaseName()).startsWith("lib")) 
+            pkgConfiglibName = "-l" + (fileInfo(fname).completeBaseName()).mid(3);
+        else
+            pkgConfiglibName = "-l" + fileInfo(fname).completeBaseName();
         if (project->isActiveConfig("shared"))
             pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
     }

[-- Attachment #5: ptxdist-device.diff --]
[-- Type: application/octet-stream, Size: 5141 bytes --]

diff -urN qt-everywhere-opensource-src-5.0.1.orig/qtbase/mkspecs/devices/linux-ptxdist-g++/qmake.conf.in qt-everywhere-opensource-src-5.0.1/qtbase/mkspecs/devices/linux-ptxdist-g++/qmake.conf.in
--- qt-everywhere-opensource-src-5.0.1.orig/qtbase/mkspecs/devices/linux-ptxdist-g++/qmake.conf.in	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-5.0.1/qtbase/mkspecs/devices/linux-ptxdist-g++/qmake.conf.in	2013-02-11 10:03:46.611891143 +0100
@@ -0,0 +1,57 @@
+#
+# qmake configuration for the BeagleBoard and BeagleBoard xM boards
+# http://beagleboard.org/
+
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                  += incremental gdb_dwarf_index
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../../common/linux.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
+
+load(device_config)
+
+QT_QPA_DEFAULT_PLATFORM = @PTXDIST_QT_QPA_DEFAULT_PLATFORM@
+
+# modifications to g++.conf
+QMAKE_CC                = @PTXDIST_COMPILER_PREFIX@gcc
+QMAKE_CXX               = @PTXDIST_COMPILER_PREFIX@g++
+QMAKE_LINK              = $${QMAKE_CXX}
+QMAKE_LINK_SHLIB        = $${QMAKE_CXX}
+
+# modifications to linux.conf
+QMAKE_AR                = @PTXDIST_COMPILER_PREFIX@ar cqs
+QMAKE_OBJCOPY           = @PTXDIST_COMPILER_PREFIX@objcopy
+QMAKE_STRIP             = @PTXDIST_COMPILER_PREFIX@strip
+
+COMPILER_FLAGS          = @PTXDIST_COMPILER_FLAGS@
+
+#modifications to gcc-base.conf
+QMAKE_CFLAGS           += $${COMPILER_FLAGS} @PTXDIST_CPPFLAGS@ @PTXDIST_CFLAGS@
+QMAKE_CXXFLAGS         += $${COMPILER_FLAGS} @PTXDIST_CPPFLAGS@ @PTXDIST_CXXFLAGS@
+QMAKE_CXXFLAGS_RELEASE += @PTXDIST_QMAKE_CXXFLAGS_RELEASE@
+QMAKE_INCDIR            = @PTXDIST_INCDIR@
+QMAKE_LIBDIR            = @PTXDIST_LIBDIR@
+QMAKE_LFLAGS            = @PTXDIST_LDFLAGS@
+
+QMAKE_LIBS             += @PTXDIST_QMAKE_LIBS@
+PKG_CONFIG_LIBDIR	+= $$(SYSROOT)/lib/pkgconfig:$$(SYSROOT)/usr/lib/pkgconfig:$$(SYSROOT)/share/pkgconfig:$$(SYSROOT)/usr/share/pkgconfig
+
+# Extra stuff (OpenGL, DirectFB, ...)
+QMAKE_INCDIR_EGL        = @PTXDIST_QMAKE_INCDIR_EGL@
+QMAKE_LIBDIR_EGL        = @PTXDIST_QMAKE_LIBDIR_EGL@
+QMAKE_INCDIR_OPENGL_ES2 = @PTXDIST_QMAKE_INCDIR_OPENGL_ES2@
+QMAKE_LIBDIR_OPENGL_ES2 = @PTXDIST_QMAKE_LIBDIR_OPENGL_ES2@
+QMAKE_INCDIR_OPENVG     = @PTXDIST_QMAKE_INCDIR_OPENVG@
+QMAKE_LIBDIR_OPENVG     = @PTXDIST_QMAKE_LIBDIR_OPENVG@
+
+QMAKE_LIBS_EGL          = @PTXDIST_QMAKE_LIBS_EGL@
+QMAKE_LIBS_OPENGL_ES2   = @PTXDIST_QMAKE_LIBS_OPENGL_ES2@
+QMAKE_LIBS_OPENVG       = @PTXDIST_QMAKE_LIBS_OPENVG@
+
+# Sanity check
+deviceSanityCheckCompiler()
+
+load(qt_config)
+
diff -urN qt-everywhere-opensource-src-5.0.1.orig/qtbase/mkspecs/devices/linux-ptxdist-g++/qplatformdefs.h.in qt-everywhere-opensource-src-5.0.1/qtbase/mkspecs/devices/linux-ptxdist-g++/qplatformdefs.h.in
--- qt-everywhere-opensource-src-5.0.1.orig/qtbase/mkspecs/devices/linux-ptxdist-g++/qplatformdefs.h.in	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-5.0.1/qtbase/mkspecs/devices/linux-ptxdist-g++/qplatformdefs.h.in	2013-01-29 20:03:06.000000000 +0100
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"

[-- Attachment #6: qt5.diff --]
[-- Type: application/octet-stream, Size: 648 bytes --]

--- qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h.orig	2013-07-25 23:05:48.082002578 +0200
+++ qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h	2013-07-25 23:06:32.038747918 +0200
@@ -25,6 +25,8 @@
 
 #include <QWindow>
 
+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
+
 namespace WebCore {
 
 class HTMLVideoElement;
@@ -55,5 +57,7 @@
 
 } // namespace WebCore
 
+#endif /* #if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1) */
+
 
 #endif // PlatformVideoWindowPrivate_h

[-- Attachment #7: series --]
[-- Type: application/octet-stream, Size: 46 bytes --]

ptxdist-device.diff
qt5.diff
pc_file_gen.diff

[-- Attachment #8: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de