qt4: rename qtopia -> qt4 and update to version 4.5.1

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10787 33e552b5-05e3-0310-8538-816dae2090ed

11 files changed, 355 insertions, 0 deletions

diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/designer-script.diff b/patches/qt-embedded-linux-opensource-src-4.5.1/designer-script.diff
new file mode 100644
index 000000000..31ed26f8f
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/designer-script.diff
@@ -0,0 +1,33 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: [PATCH] fix QtScript handling for designer lib
+
+FIXME: This patch does not work yet. The -lQtScript dependency
+FIXME: leaks in via pkg-config!
+
+While linking FIXME we get this error when compiling without support for
+QtScript:
+
+${toolchain}/bin/../lib/gcc/i586-unknown-linux-gnu/4.3.2/ ../../../../i586-unknown-linux-gnu/bin/ld: cannot find -lQtScript
+
+Fix by adding QtScript only when supported.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ tools/designer/src/components/lib/lib.pro |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/components/lib/lib.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/components/lib/lib.pro
++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/components/lib/lib.pro
+@@ -64,7 +64,8 @@ PRECOMPILED_HEADER= lib_pch.h
+ include(../../sharedcomponents.pri)
+ include(../component.pri)
+ 
+-unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtScript QtXml
++unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
++unix:!isEmpty(QT_BUILD_SCRIPT_LIB):QMAKE_PKGCONFIG_REQUIRES += QtScript
+ 
+ target.path=$$[QT_INSTALL_LIBS]
+ INSTALLS        += target
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/fix-configure-disable.diff b/patches/qt-embedded-linux-opensource-src-4.5.1/fix-configure-disable.diff
new file mode 100644
index 000000000..170572185
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/fix-configure-disable.diff
@@ -0,0 +1,48 @@
+Subject: fix disabling jpeg/mng/tiff
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+
+Setting -no-libjpeg, -no-libmng and -no-libtiff does not work.
+This patch ensures that these are disabled even if the corresponding
+libraries are found. The method is copied from the libpng handling.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -5533,7 +5533,9 @@ fi
+ if [ "$CFG_INOTIFY" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG inotify"
+ fi
+-if [ "$CFG_LIBJPEG" = "system" ]; then
++if [ "$CFG_LIBJPEG" = "no" ]; then
++    CFG_JPEG="no"
++elif [ "$CFG_LIBJPEG" = "system" ]; then
+     QT_CONFIG="$QT_CONFIG system-jpeg"
+ fi
+ if [ "$CFG_JPEG" = "no" ]; then
+@@ -5541,6 +5543,9 @@ if [ "$CFG_JPEG" = "no" ]; then
+ elif [ "$CFG_JPEG" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG jpeg"
+ fi
++if [ "$CFG_LIBMNG" = "no" ]; then
++    CFG_MNG="no"
++fi
+ if [ "$CFG_LIBMNG" = "system" ]; then
+     QT_CONFIG="$QT_CONFIG system-mng"
+ fi
+@@ -5565,7 +5570,9 @@ if [ "$CFG_GIF" = "no" ]; then
+ elif [ "$CFG_GIF" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG gif"
+ fi
+-if [ "$CFG_LIBTIFF" = "system" ]; then
++if [ "$CFG_LIBTIFF" = "no" ]; then
++    CFG_TIFF="no"
++elif [ "$CFG_LIBTIFF" = "system" ]; then
+     QT_CONFIG="$QT_CONFIG system-tiff"
+ fi
+ if [ "$CFG_TIFF" = "no" ]; then
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/hide-cursor-at-startup.diff b/patches/qt-embedded-linux-opensource-src-4.5.1/hide-cursor-at-startup.diff
new file mode 100644
index 000000000..a9ef77b9f
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/hide-cursor-at-startup.diff
@@ -0,0 +1,27 @@
+Subject: Hack: hide cursor during startup
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+
+This will hide the cursor during application startup.
+To keep it hidden the application must call
+QApplication::setOverrideCursor(Qt::BlankCursor);
+Otherwise the cursor returns when the mouse is moved.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ src/gui/embedded/qwscursor_qws.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/src/gui/embedded/qwscursor_qws.cpp
+===================================================================
+--- a/src/gui/embedded/qwscursor_qws.cpp
++++ b/src/gui/embedded/qwscursor_qws.cpp
+@@ -344,7 +344,7 @@ void QWSServerPrivate::initializeCursor(
+ 
+     // default cursor
+     cursor = 0;
+-    setCursor(QWSCursor::systemCursor(Qt::ArrowCursor));
++    setCursor(QWSCursor::systemCursor(Qt::BlankCursor));
+ #endif
+     q->sendMouseEvent(QPoint(swidth/2, sheight/2), 0);
+ }
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/ptx-mkspec.diff b/patches/qt-embedded-linux-opensource-src-4.5.1/ptx-mkspec.diff
new file mode 100644
index 000000000..e09b183a9
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/ptx-mkspec.diff
@@ -0,0 +1,114 @@
+Subject: mkspec for ptxdist
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+
+Add a mkspec for ptxdist:
+- qplatformdefs.h
+    Include the generic qplatformdefs.h
+- qmake.conf.in
+    Used to generate qmake.conf with the correct toolchain.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ mkspecs/qws/linux-ptx-g++/qmake.conf.in   |   87 ++++++++++++++++++++++++++++++
+ mkspecs/qws/linux-ptx-g++/qplatformdefs.h |    2 
+ 2 files changed, 89 insertions(+)
+
+Index: b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
+===================================================================
+--- /dev/null
++++ b/mkspecs/qws/linux-ptx-g++/qmake.conf.in
+@@ -0,0 +1,87 @@
++#
++# qmake configuration for linux-g++
++#
++
++MAKEFILE_GENERATOR	= UNIX
++TEMPLATE		= app
++CONFIG			+= qt link_prl
++QT                      += core gui network
++QMAKE_INCREMENTAL_STYLE = sublib
++
++QMAKE_CC		= @COMPILER_PREFIX@gcc
++QMAKE_LEX		= flex
++QMAKE_LEXFLAGS		=
++QMAKE_YACC		= yacc
++QMAKE_YACCFLAGS		= -d
++QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS_WARN_ON	= -Wall -W
++QMAKE_CFLAGS_WARN_OFF	=
++QMAKE_CFLAGS_RELEASE	= -O2
++QMAKE_CFLAGS_DEBUG	= -g
++QMAKE_CFLAGS_SHLIB	= -fPIC
++QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
++QMAKE_CFLAGS_THREAD	= -D_REENTRANT
++QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
++
++QMAKE_CXX		= @COMPILER_PREFIX@g++
++QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
++QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
++QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
++QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
++QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
++QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
++QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
++QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
++QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
++
++QMAKE_INCDIR		= @INCDIR@
++QMAKE_LIBDIR		= @LIBDIR@
++QMAKE_INCDIR_X11	= 
++QMAKE_LIBDIR_X11	= 
++QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
++QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
++QMAKE_INCDIR_OPENGL	= 
++QMAKE_LIBDIR_OPENGL	= 
++QMAKE_INCDIR_QTOPIA	= $(QPEDIR)/include/
++QMAKE_LIBDIR_QTOPIA	= $(QPEDIR)/lib
++
++QMAKE_LINK		= @COMPILER_PREFIX@g++
++QMAKE_LINK_SHLIB	= @COMPILER_PREFIX@g++
++QMAKE_LFLAGS		= @LDFLAGS@
++QMAKE_LFLAGS_RELEASE	=
++QMAKE_LFLAGS_DEBUG	=
++QMAKE_LFLAGS_SHLIB      = -shared
++QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
++QMAKE_LFLAGS_SONAME     = -Wl,-soname,
++QMAKE_LFLAGS_THREAD     =
++QMAKE_RPATH             = -Wl,-rpath,
++
++QMAKE_LIBS		= 
++QMAKE_LIBS_DYNLOAD      = -ldl
++QMAKE_LIBS_X11		= 
++QMAKE_LIBS_X11SM	= 
++QMAKE_LIBS_QT		= -lqte
++QMAKE_LIBS_QT_THREAD    = -lqte-mt
++QMAKE_LIBS_QT_OPENGL	= -lqgl
++QMAKE_LIBS_QTOPIA	= -lqtopia -lqpe
++QMAKE_LIBS_THREAD       = -lpthread
++QMAKE_LIBS_OPENGL	=
++
++QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
++QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
++
++QMAKE_AR		= @COMPILER_PREFIX@ar cqs
++QMAKE_RANLIB		=
++
++QMAKE_TAR		= tar -cf
++QMAKE_GZIP		= gzip -9f
++
++QMAKE_COPY		= cp -f
++QMAKE_MOVE		= mv -f
++QMAKE_DEL_FILE		= rm -f
++QMAKE_DEL_DIR		= rmdir
++QMAKE_STRIP             = strip
++QMAKE_CHK_DIR_EXISTS	= test -d
++QMAKE_MKDIR		= mkdir -p
++include(../../common/unix.conf)
++load(qt_config)
+Index: b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h
+===================================================================
+--- /dev/null
++++ b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h
+@@ -0,0 +1,2 @@
++
++#include "../../linux-g++/qplatformdefs.h"
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/qt-embedded-linux-opensource-src-4.5.0-fix-prl-paths.diff b/patches/qt-embedded-linux-opensource-src-4.5.1/qt-embedded-linux-opensource-src-4.5.0-fix-prl-paths.diff
new file mode 100644
index 000000000..7e2be9932
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/qt-embedded-linux-opensource-src-4.5.0-fix-prl-paths.diff
@@ -0,0 +1,35 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: [PATCH] qmake: avoid host path leakage while building with INSTALL_ROOT
+
+When building with INSTALL_ROOT (i.e. for cross compilation), qmake
+nevertheless generates a 'sed' expression to replace the local build
+path by /usr/{lib,include}. If we now assume an application which uses
+qmake to compile&link against the freshly installed, we observe an
+occurence of "-L/usr/lib" in the generated Makefiles. This may
+accidently work on developer machines where people often have another
+copy of Qt in that place, but fails for example badly while cross
+compiling.
+
+The patch below fixes it by adding $(INSTALL_ROOT) to the replacement
+path. If set during 'make install', it will be used instead of the plain
+prefix.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ qmake/generators/unix/unixmake.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/qmake/generators/unix/unixmake.cpp
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/qmake/generators/unix/unixmake.cpp
++++ qt-embedded-linux-opensource-src-4.5.0/qmake/generators/unix/unixmake.cpp
+@@ -840,7 +840,7 @@ UnixMakefileGenerator::defaultInstall(co
+                         const QString match = project->first(replace_rules.at(r) + ".match"),
+                                     replace = project->first(replace_rules.at(r) + ".replace");
+                         if(!match.isEmpty() /*&& match != replace*/)
+-                            ret += " -e \"s," + match + "," + replace + ",g\"";
++                            ret += " -e \"s," + match + ",$(INSTALL_ROOT)" + replace + ",g\"";
+                     }
+                     ret += " \"" + src_meta + "\" >\"" + dst_meta + "\"";
+                     //ret += " || " + install_meta;
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/remove-ordered.diff b/patches/qt-embedded-linux-opensource-src-4.5.1/remove-ordered.diff
new file mode 100644
index 000000000..002a203b8
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/remove-ordered.diff
@@ -0,0 +1,24 @@
+Subject: disable ordered compiling.
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+
+By default all modules are compiled in a predefined order. This breaks when
+building not all modules. This patch disables ordered building. As a result
+qmake generates the correct dependancies.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ projects.pro |    1 -
+ 1 file changed, 1 deletion(-)
+
+Index: b/projects.pro
+===================================================================
+--- a/projects.pro
++++ b/projects.pro
+@@ -2,7 +2,6 @@
+ # Main projectfile
+ #####################################################################
+ 
+-CONFIG += ordered
+ TEMPLATE = subdirs
+ 
+ cross_compile: CONFIG += nostrip
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/script-qtdbus.diff b/patches/qt-embedded-linux-opensource-src-4.5.1/script-qtdbus.diff
new file mode 100644
index 000000000..4726d724c
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/script-qtdbus.diff
@@ -0,0 +1,27 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: [PATCH] qtdbus needs qtscript
+
+When building qt without QtScript support, I get this error:
+
+make[4]: Entering directory `qt-embedded-linux-opensource-src-4.5.0/src/plugins/script/qtdbus'
+rm -f libqtscriptdbus.so
+i586-unknown-linux-gnu-g++ -L${sysroot}/lib -L${sysroot}/usr/lib -Wl,-rpath-link -Wl,${sysroot}/lib -Wl,-rpath-link -Wl,${sysroot}/usr/lib -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib -shared -o libqtscriptdbus.so .obj/release-shared-emb-i386/main.o .obj/release-shared-emb-i386/moc_main.o -Lqt-embedded-linux-opensource-src-4.5.0/lib -L${sysroot}/lib -L${sysroot}/usr/lib -lQtDBus -Lqt-embedded-linux-opensource-src-4.5.0/lib -L${sysroot}/lib -L${sysroot}/usr/lib -lQtXml -lQtScript -lQtGui -lts -lpng -lfreetype -lQtNetwork -lQtCore -lz -lm -lrt -lpthread -ldl
+${TOOLCHAIN}/bin/../lib/gcc/i586-unknown-linux-gnu/4.3.2/../../../../i586-unknown-linux-gnu/bin/ld:
+cannot find -lQtScript
+
+The qtdbus directory needs qtscript, so we reflect this in script.pro.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ src/plugins/script/script.pro |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/src/plugins/script/script.pro
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/src/plugins/script/script.pro
++++ qt-embedded-linux-opensource-src-4.5.0/src/plugins/script/script.pro
+@@ -1,2 +1,2 @@
+ TEMPLATE = subdirs
+-contains(QT_CONFIG, dbus):SUBDIRS += qtdbus
++contains(QT_CONFIG, dbus):!isEmpty(QT_BUILD_SCRIPT_LIB):SUBDIRS += qtdbus
diff --git a/patches/qt-embedded-linux-opensource-src-4.5.1/series b/patches/qt-embedded-linux-opensource-src-4.5.1/series
new file mode 100644
index 000000000..fc1b33993
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.5.1/series
@@ -0,0 +1,11 @@
+ptx-mkspec.diff
+remove-ordered.diff
+fix-configure-disable.diff
+qt-embedded-linux-opensource-src-4.5.0-fix-prl-paths.diff
+hide-cursor-at-startup.diff
+# SCRIPT_LIB is not marked in QT_CONFIG, checking the define with isEmpty or
+# contains(DEFINES, .....) seems not to work. This is probably a name space
+# problem, till we have a better solution, disable the patch here and for the
+# dependency with ptxdist.
+#script-qtdbus.diff
+#designer-script.diff
diff --git a/patches/qwt-5.2.0/disable-designer-plugins.diff b/patches/qwt-5.2.0/disable-designer-plugins.diff
new file mode 100644
index 000000000..e7d9f1917
--- /dev/null
+++ b/patches/qwt-5.2.0/disable-designer-plugins.diff
@@ -0,0 +1,17 @@
+---
+ qwtconfig.pri |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/qwtconfig.pri
+===================================================================
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -114,7 +114,7 @@ CONFIG     += QwtWidgets
+ # Otherwise you have to build it from the designer directory.
+ ######################################################################
+ 
+-CONFIG     += QwtDesigner
++#CONFIG     += QwtDesigner
+ 
+ ######################################################################
+ # If you want to auto build the examples, enable the line below
diff --git a/patches/qwt-5.2.0/qwt-5.1.1-fix-prefix.diff b/patches/qwt-5.2.0/qwt-5.1.1-fix-prefix.diff
new file mode 100644
index 000000000..622fc7447
--- /dev/null
+++ b/patches/qwt-5.2.0/qwt-5.1.1-fix-prefix.diff
@@ -0,0 +1,17 @@
+---
+ qwtconfig.pri |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/qwtconfig.pri
+===================================================================
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -8,7 +8,7 @@ VER_PAT      = 0
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+ 
+ unix {
+-    INSTALLBASE    = /usr/local/qwt-5.2.0
++    INSTALLBASE    = /usr
+ }
+ 
+ win32 {
diff --git a/patches/qwt-5.2.0/series b/patches/qwt-5.2.0/series
new file mode 100644
index 000000000..0391ba9a2
--- /dev/null
+++ b/patches/qwt-5.2.0/series
@@ -0,0 +1,2 @@
+qwt-5.1.1-fix-prefix.diff
+disable-designer-plugins.diff