qt5: upgrade from 5.2.1 to 5.3.0

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

8 files changed, 149 insertions, 123 deletions

diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
index b8768c89..e1135ce6 100644
--- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,4 +1,4 @@
-From 7999eeb3f2ab1150aa301ec26ae9bf0788d09c9e Mon Sep 17 00:00:00 2001
+From 4d690dbc278063648434b0f02bdb1b6f4623b285 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 23:15:37 +0200
 Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement
@@ -47,10 +47,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 13 insertions(+), 7 deletions(-)
 
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 11509ee..be9b929 100644
+index 2134077..a88b8cc 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
-@@ -135,30 +135,36 @@ load(qt_installs)
+@@ -170,30 +170,36 @@ load(qt_installs)
      rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
  else: \
      rplbase = $$MODULE_BASE_OUTDIR
@@ -75,7 +75,7 @@ index 11509ee..be9b929 100644
 +lafile_replace.CONFIG = path
 +QMAKE_PRL_INSTALL_REPLACE += lib_replace lafile_replace
  
- unix|win32-g++* {
+ unix|mingw {
     CONFIG += create_pc
     QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace
 -   QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace
@@ -93,7 +93,7 @@ index 11509ee..be9b929 100644
 +   QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace lafile_replace
  }
  
- unix|win32-g++* {
+ unix|mingw {
 -- 
-1.8.5.3
+1.9.3
 
diff --git a/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
new file mode 100644
index 00000000..2f4d80cd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -0,0 +1,30 @@
+From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 19 Mar 2014 18:32:28 +0100
+Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+index f665455..9eb783c 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
++++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+@@ -46,6 +46,12 @@
+ #include <qpa/qplatformnativeinterface.h>
+ #include <EGL/egl.h>
+ 
++// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
++// /usr/include/X11/X.h:#define CursorShape           0       /* largest size that can be displayed */
++#ifdef CursorShape
++#undef CursorShape
++#endif
++
+ QT_BEGIN_NAMESPACE
+ 
+ class QEGLPlatformScreen;
+-- 
+2.0.0
+
diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
index 5681b583..c55bc542 100644
--- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
@@ -1,4 +1,4 @@
-From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 Mon Sep 17 00:00:00 2001
+From 745055eb0f56ec4d48ea2ce57bcf3d0011afcec0 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH 10/12] Always build uic
@@ -10,14 +10,14 @@ Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
 Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- src/src.pro | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/src.pro b/src/src.pro
-index b7887a6..8801544 100644
+index 6a805a6..90623a6 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -145,7 +145,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
+@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
          }
      }
  }
@@ -26,13 +26,6 @@ index b7887a6..8801544 100644
  
  nacl: SUBDIRS -= src_network src_testlib
  
-@@ -156,4 +156,4 @@ TR_EXCLUDE = \
-     src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
- 
- sub-tools.depends = $$TOOLS
--QMAKE_EXTRA_TARGETS = sub-tools
-\ No newline at end of file
-+QMAKE_EXTRA_TARGETS = sub-tools
 -- 
-1.8.5.3
+1.9.3
 
diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
index c6ec67cb..54039de9 100644
--- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,4 +1,4 @@
-From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 Mon Sep 17 00:00:00 2001
+From 3c7bfc66e6c84fe06b16dfa0b76ee71701e8d5b5 Mon Sep 17 00:00:00 2001
 From: Jani Hautakangas <jani.hautakangas@ixonos.com>
 Date: Thu, 16 May 2013 09:52:07 +0300
 Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support
@@ -14,13 +14,13 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  src/gui/opengl/qopenglpaintdevice.cpp       | 12 ++++++++++++
  src/gui/opengl/qopenglpaintdevice.h         |  2 ++
- src/gui/opengl/qopenglpaintengine.cpp       | 10 +++++++---
+ src/gui/opengl/qopenglpaintengine.cpp       |  9 +++++++--
  src/gui/opengl/qopenglpaintengine_p.h       |  1 +
  src/gui/opengl/qopengltextureglyphcache.cpp |  2 +-
- 5 files changed, 23 insertions(+), 4 deletions(-)
+ 5 files changed, 23 insertions(+), 3 deletions(-)
 
 diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
-index fa392d1..5df1762 100644
+index 6750458..034630a 100644
 --- a/src/gui/opengl/qopenglpaintdevice.cpp
 +++ b/src/gui/opengl/qopenglpaintdevice.cpp
 @@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
@@ -76,7 +76,7 @@ index c05571c..01eb1bc 100644
      void setSize(const QSize &size);
      void setDevicePixelRatio(qreal devicePixelRatio);
 diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
-index 0513551..f6aeb15 100644
+index 81a0d82..ce57261 100644
 --- a/src/gui/opengl/qopenglpaintengine.cpp
 +++ b/src/gui/opengl/qopenglpaintengine.cpp
 @@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
@@ -90,24 +90,24 @@ index 0513551..f6aeb15 100644
      d->width = sz.width();
      d->height = sz.height();
      d->mode = BrushDrawingMode;
-@@ -2073,7 +2076,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
+@@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
          d->device->ensureActiveTarget();
  
          d->transferMode(BrushDrawingMode);
--        glViewport(0, 0, d->width, d->height);
-+        glViewport(d->x, d->y, d->width, d->height);
+-        d->funcs.glViewport(0, 0, d->width, d->height);
++        d->funcs.glViewport(d->x, d->y, d->width, d->height);
          d->needsSync = false;
          d->lastMaskTextureUsed = 0;
          d->shaderManager->setDirty();
-@@ -2116,6 +2119,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
      if (bounds == QRect(0, 0, width, height)) {
-         glDisable(GL_SCISSOR_TEST);
+         funcs.glDisable(GL_SCISSOR_TEST);
      } else {
 +        bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height());
-         glEnable(GL_SCISSOR_TEST);
+         funcs.glEnable(GL_SCISSOR_TEST);
          setScissor(bounds);
      }
-@@ -2124,14 +2128,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
  
  void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
  {
@@ -120,12 +120,10 @@ index 0513551..f6aeb15 100644
      }
 +    bottom += y;
      const int height = rect.height();
--
-     glScissor(left, bottom, width, height);
- }
  
+     funcs.glScissor(left, bottom, width, height);
 diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
-index d51f0e5..0d4b38d 100644
+index 4f0e2e5..f211de1 100644
 --- a/src/gui/opengl/qopenglpaintengine_p.h
 +++ b/src/gui/opengl/qopenglpaintengine_p.h
 @@ -264,6 +264,7 @@ public:
@@ -137,18 +135,18 @@ index d51f0e5..0d4b38d 100644
      QOpenGLContext *ctx;
      EngineMode mode;
 diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
-index 3b62d1d..a5d1f7e 100644
+index ac88d9d..6c77f10 100644
 --- a/src/gui/opengl/qopengltextureglyphcache.cpp
 +++ b/src/gui/opengl/qopengltextureglyphcache.cpp
-@@ -273,7 +273,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
-     funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
+@@ -315,7 +315,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
+     funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
  
      if (pex != 0) {
--        glViewport(0, 0, pex->width, pex->height);
-+        glViewport(pex->x, pex->y, pex->width, pex->height);
+-        funcs->glViewport(0, 0, pex->width, pex->height);
++        funcs->glViewport(pex->x, pex->y, pex->width, pex->height);
          pex->updateClipScissorTest();
      } else {
-         m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
+         if (m_vao.isCreated()) {
 -- 
-1.8.5.3
+1.9.3
 
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
deleted file mode 100644
index a31301e3..00000000
--- a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 99979159a404df09495c8ddd6a052837f66b8739 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
-Date: Fri, 7 Feb 2014 13:12:37 +0100
-Subject: [PATCH] Fix linuxfb argument 'mmsize' parsing
-
-Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'.
-
-Upstream-Status: Backport
-
-Task-number: QTBUG-29133
-Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1
-Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-index 735a43d..33a9523 100644
---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-@@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize()
-     foreach (const QString &arg, mArgs) {
-         if (arg == QLatin1String("nographicsmodeswitch"))
-             doSwitchToGraphicsMode = false;
-+        else if (mmSizeRx.indexIn(arg) != -1)
-+            userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
-         else if (sizeRx.indexIn(arg) != -1)
-             userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt()));
-         else if (offsetRx.indexIn(arg) != -1)
-@@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize()
-             ttyDevice = ttyRx.cap(1);
-         else if (fbRx.indexIn(arg) != -1)
-             fbDevice = fbRx.cap(1);
--        else if (mmSizeRx.indexIn(arg) != -1)
--            userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
-     }
- 
-     if (fbDevice.isEmpty()) {
--- 
-1.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
new file mode 100644
index 00000000..612cbdda
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
@@ -0,0 +1,30 @@
+From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 15:09:23 +0200
+Subject: [PATCH] Fix missing plugin_types
+
+* bearer/generic was failing with:
+  Project ERROR: No module claims plugin type 'bearer'
+
+Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ mkspecs/features/qt_module_pris.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
+index f31bc38..415e780 100644
+--- a/mkspecs/features/qt_module_pris.prf
++++ b/mkspecs/features/qt_module_pris.prf
+@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
+         include($$mod_work_pfx/qt_lib_$${pri}.pri)
+     for(mod, mods_to_load) {
+         for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
+-                        name depends module_config CONFIG DEFINES sources \
++                        name depends module_config plugin_types CONFIG DEFINES sources \
+                         includes bins libs libexecs plugins imports qml \
+                         rpath_link \
+                 )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
+-- 
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
new file mode 100644
index 00000000..65ebbd1c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -0,0 +1,56 @@
+From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 19:22:04 +0200
+Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+
+This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
+---
+ src/platformsupport/eglconvenience/qeglconvenience.cpp     | 4 +++-
+ src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 -------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+index e6624fb..3870f6c 100644
+--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
+     for (index = 0; attrs[index].attr != -1; ++index) {
+         EGLint value;
+         if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
+-            qDebug("\t%s: %d", attrs[index].name, (int)value);
++            qWarning("\t%s: %d\n", attrs[index].name, (int)value);
+         }
+     }
++
++    qWarning("\n");
+ }
+ 
+ #ifdef Q_OS_LINUX
+diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+index eec6463..4a7c69b 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+@@ -44,7 +44,6 @@
+ #include "qeglpbuffer_p.h"
+ #include <qpa/qplatformwindow.h>
+ #include <QOpenGLContext>
+-#include <QDebug>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont
+         return;
+     }
+ 
+-    static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt();
+-    if (printConfig) {
+-        qDebug() << "Created context for format" << format << "with config:";
+-        q_printEglConfig(m_eglDisplay, m_eglConfig);
+-    }
+-
+ #ifndef QT_NO_OPENGL
+     // Make the context current to ensure the GL version query works. This needs a surface too.
+     const EGLint pbufferAttributes[] = {
+-- 
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
deleted file mode 100644
index 92785e45..00000000
--- a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 84756d94c73885803ad8044099ab47c0c49b5076 Mon Sep 17 00:00:00 2001
-From: Laszlo Agocs <laszlo.agocs@digia.com>
-Date: Thu, 23 Jan 2014 11:45:22 +0100
-Subject: [PATCH] eglfs: Fix quad coordinates
-
-Prevent artifacts on raster windows by properly mapping
-the coordinates to [-1,1].
-
-Upstream-Status: Backport
-
-Task-number: QTBUG-36370
-Change-Id: I95d0d03952f597ef4ce6a950c6533a3af2df964a
-Reviewed-by: Andy Nichols <andy.nichols@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/plugins/platforms/eglfs/qeglfscompositor.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.cpp b/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-index 845bb5b..1efc4f7 100644
---- a/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-+++ b/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-@@ -153,10 +153,11 @@ void QEglFSCompositor::render(QEglFSWindow *window, uint texture, bool raster)
-     QPoint tl = r.topLeft();
-     QPoint br = r.bottomRight();
- 
-+    // Map to [-1,1]
-     GLfloat x1 = (tl.x() / sr.width()) * 2 - 1;
--    GLfloat x2 = (br.x() / sr.width()) * 2 - 1;
-     GLfloat y1 = ((sr.height() - tl.y()) / sr.height()) * 2 - 1;
--    GLfloat y2 = ((sr.height() - br.y()) / sr.height()) * 2 - 1;
-+    GLfloat x2 = ((br.x() + 1) / sr.width()) * 2 - 1;
-+    GLfloat y2 = ((sr.height() - (br.y() + 1)) / sr.height()) * 2 - 1;
- 
-     if (!raster)
-         qSwap(y1, y2);
--- 
-1.7.1
-