Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 425 insertions, 0 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java b/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
new file mode 100644
index 0000000000..6ee1304c12
--- /dev/null
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
@@ -0,0 +1,425 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2013 BogDan Vatra <bogdan@kde.org>
+ ** Contact: http://www.qt-project.org/legal
+ **
+ ** This file is part of the Android port 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$
+ **
+ ****************************************************************************/
+
+
+package org.qtproject.qt5.android;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.text.ClipboardManager;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+
+class QtNativeDialogHelper
+{
+    static native void dialogResult(long handler, int buttonID);
+}
+
+class ButtonStruct implements View.OnClickListener
+{
+    ButtonStruct(QtMessageDialogHelper dialog, int id, String text)
+    {
+        m_dialog = dialog;
+        m_id = id;
+        m_text = text;
+    }
+    QtMessageDialogHelper m_dialog;
+    private int m_id;
+    String m_text;
+
+    @Override
+    public void onClick(View view) {
+        QtNativeDialogHelper.dialogResult(m_dialog.handler(), m_id);
+    }
+}
+
+public class QtMessageDialogHelper
+{
+
+    public QtMessageDialogHelper(Activity activity)
+    {
+        m_activity = activity;
+    }
+
+
+    public void setIcon(int icon)
+    {
+        m_icon = icon;
+
+    }
+
+    private Drawable getIconDrawable()
+    {
+        if (m_icon == 0)
+            return null;
+
+        if (Build.VERSION.SDK_INT > 10) {
+            try {
+                TypedValue typedValue = new TypedValue();
+                m_theme.resolveAttribute(Class.forName("android.R$attr").getDeclaredField("alertDialogIcon").getInt(null), typedValue, true);
+                return m_activity.getResources().getDrawable(typedValue.resourceId);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        // Information, Warning, Critical, Question
+        switch (m_icon)
+        {
+            case 1: // Information
+                try {
+                    return m_activity.getResources().getDrawable(Class.forName("android.R$drawable").getDeclaredField("ic_dialog_info").getInt(null));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 2: // Warning
+//                try {
+//                    return Class.forName("android.R$drawable").getDeclaredField("stat_sys_warning").getInt(null);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//                break;
+            case 3: // Critical
+                try {
+                    return m_activity.getResources().getDrawable(Class.forName("android.R$drawable").getDeclaredField("ic_dialog_alert").getInt(null));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 4: // Question
+                try {
+                    return m_activity.getResources().getDrawable(Class.forName("android.R$drawable").getDeclaredField("ic_menu_help").getInt(null));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
+        }
+        return null;
+    }
+
+    public void setTile(String title)
+    {
+        m_title = title;
+    }
+
+    public void setText(String text)
+    {
+        m_text = text;
+    }
+
+    public void setInformativeText(String informativeText)
+    {
+        m_informativeText = informativeText;
+    }
+
+    public void setDetailedText(String text)
+    {
+        m_detailedText = text;
+    }
+
+    public void addButton(int id, String text)
+    {
+        if (m_buttonsList == null)
+            m_buttonsList = new ArrayList<ButtonStruct>();
+        m_buttonsList.add(new ButtonStruct(this, id, text));
+    }
+
+    private void setTextAppearance(TextView view, String attr, String style)
+    {
+        try {
+            int[] attrs = (int[]) Class.forName("android.R$styleable").getDeclaredField("TextAppearance").get(null);
+            final TypedArray a = m_theme.obtainStyledAttributes(null,
+                    attrs,
+                    Class.forName("android.R$attr").getDeclaredField(attr).getInt(null),
+                    Class.forName("android.R$style").getDeclaredField(style).getInt(null));
+            final int textSize = a.getDimensionPixelSize(
+                    Class.forName("android.R$styleable").getDeclaredField("TextAppearance_textSize").getInt(null), 0);
+            if (textSize != 0)
+                view.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+
+            final int textColor = a.getColor(
+                    Class.forName("android.R$styleable").getDeclaredField("TextAppearance_textColor").getInt(null), 0x3138);
+            if (textColor != 0x3138)
+                view.setTextColor(textColor);
+
+            a.recycle();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private Drawable getStyledDrawable(String drawable) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException
+    {
+        int[] attrs = {Class.forName("android.R$attr").getDeclaredField(drawable).getInt(null)};
+        final TypedArray a = m_theme.obtainStyledAttributes(attrs);
+        Drawable d = a.getDrawable(0);
+        a.recycle();
+        return  d;
+    }
+
+
+    public void show(long handler)
+    {
+        m_handler = handler;
+        m_activity.runOnUiThread( new Runnable() {
+            @Override
+            public void run() {
+                if (m_dialog != null && m_dialog.isShowing())
+                    m_dialog.dismiss();
+
+                m_dialog = new AlertDialog.Builder(m_activity).create();
+                m_theme = m_dialog.getWindow().getContext().getTheme();
+
+                if (m_title != null)
+                    m_dialog.setTitle(m_title);
+                m_dialog.setOnCancelListener( new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialogInterface) {
+                        QtNativeDialogHelper.dialogResult(handler(), -1);
+                    }
+                });
+                m_dialog.setCancelable(m_buttonsList == null);
+                m_dialog.setCanceledOnTouchOutside(m_buttonsList == null);
+                m_dialog.setIcon(getIconDrawable());
+                ScrollView scrollView = new ScrollView(m_activity);
+                RelativeLayout dialogLayout = new RelativeLayout(m_activity);
+                int id = 1;
+                View lastView = null;
+                View.OnLongClickListener copyText = new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View view) {
+                        TextView tv = (TextView)view;
+                        if (tv != null) {
+                            ClipboardManager cm = (android.text.ClipboardManager) m_activity.getSystemService(Context.CLIPBOARD_SERVICE);
+                            cm.setText(tv.getText());
+                        }
+                        return true;
+                    }
+                };
+                if (m_text != null)
+                {
+                    TextView view = new TextView(m_activity);
+                    view.setId(id++);
+                    view.setOnLongClickListener(copyText);
+                    view.setLongClickable(true);
+
+                    view.setText(m_text);
+                    setTextAppearance(view, "textAppearanceMedium", "TextAppearance_Medium");
+
+                    RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+                    layout.setMargins(16, 8, 16, 8);
+                    layout.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+                    dialogLayout.addView(view, layout);
+                    lastView = view;
+                }
+
+                if (m_informativeText != null)
+                {
+                    TextView view= new TextView(m_activity);
+                    view.setId(id++);
+                    view.setOnLongClickListener(copyText);
+                    view.setLongClickable(true);
+
+                    view.setText(m_informativeText);
+                    setTextAppearance(view, "textAppearanceMedium", "TextAppearance_Medium");
+
+                    RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+                    layout.setMargins(16, 8, 16, 8);
+                    if (lastView != null)
+                        layout.addRule(RelativeLayout.BELOW, lastView.getId());
+                    else
+                        layout.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+                    dialogLayout.addView(view, layout);
+                    lastView = view;
+                }
+
+                if (m_detailedText != null)
+                {
+                    TextView view= new TextView(m_activity);
+                    view.setId(id++);
+                    view.setOnLongClickListener(copyText);
+                    view.setLongClickable(true);
+
+                    view.setText(m_detailedText);
+                    setTextAppearance(view, "textAppearanceSmall", "TextAppearance_Small");
+
+                    RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+                    layout.setMargins(16, 8, 16, 8);
+                    if (lastView != null)
+                        layout.addRule(RelativeLayout.BELOW, lastView.getId());
+                    else
+                        layout.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+                    dialogLayout.addView(view, layout);
+                    lastView = view;
+                }
+
+                if (m_buttonsList != null)
+                {
+                    LinearLayout buttonsLayout = new LinearLayout(m_activity);
+                    buttonsLayout.setOrientation(LinearLayout.HORIZONTAL);
+                    buttonsLayout.setId(id++);
+                    boolean firstButton = true;
+                    for (ButtonStruct button: m_buttonsList)
+                    {
+                        Button bv;
+                        if (Build.VERSION.SDK_INT > 10) {
+                            try {
+                                bv = new Button(m_activity, null, Class.forName("android.R$attr").getDeclaredField("borderlessButtonStyle").getInt(null));
+                            } catch (Exception e) {
+                                bv = new Button(m_activity);
+                                e.printStackTrace();
+                            }
+                        } else {
+                            bv = new Button(m_activity);
+                        }
+
+                        bv.setText(button.m_text);
+                        bv.setOnClickListener(button);
+                        if (!firstButton) // first button
+                        {
+                            LinearLayout.LayoutParams layout = null;
+                            View spacer = new View(m_activity);
+                            if (Build.VERSION.SDK_INT > 10) {
+                                try {
+                                    layout = new LinearLayout.LayoutParams(1, RelativeLayout.LayoutParams.MATCH_PARENT);
+                                    spacer.setBackgroundDrawable(getStyledDrawable("dividerVertical"));
+                                    buttonsLayout.addView(spacer, layout);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                        LinearLayout.LayoutParams layout = null;
+                        layout = new LinearLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT, 1.0f);
+                        buttonsLayout.addView(bv, layout);
+                        firstButton = false;
+                    }
+
+                    if (Build.VERSION.SDK_INT > 10) {
+                        try {
+                            View horizontalDevider = new View(m_activity);
+                            horizontalDevider.setId(id++);
+                            horizontalDevider.setBackgroundDrawable(getStyledDrawable("dividerHorizontal"));
+                            RelativeLayout.LayoutParams relativeParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, 1);
+                            relativeParams.setMargins(0, 10, 0, 0);
+                            if (lastView != null) {
+                                relativeParams.addRule(RelativeLayout.BELOW, lastView.getId());
+                            }
+                            else
+                                relativeParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+                            dialogLayout.addView(horizontalDevider, relativeParams);
+                            lastView = horizontalDevider;
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    RelativeLayout.LayoutParams relativeParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+                    if (lastView != null) {
+                        relativeParams.addRule(RelativeLayout.BELOW, lastView.getId());
+                    }
+                    else
+                        relativeParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+                    if (Build.VERSION.SDK_INT < 11)
+                        relativeParams.setMargins(2, 12, 2, 4);
+                    else
+                        relativeParams.setMargins(2, 0, 2, 0);
+                    dialogLayout.addView(buttonsLayout, relativeParams);
+                }
+                scrollView.addView(dialogLayout);
+                m_dialog.setView(scrollView);
+                m_dialog.show();
+            }
+        });
+    }
+
+    public void hide()
+    {
+        m_activity.runOnUiThread( new Runnable() {
+            @Override
+            public void run() {
+                if (m_dialog != null && m_dialog.isShowing())
+                    m_dialog.dismiss();
+                reset();
+            }
+        });
+    }
+
+    public long handler()
+    {
+        return m_handler;
+    }
+
+    public void reset()
+    {
+        m_icon = 0;
+        m_title = null;
+        m_text = null;
+        m_informativeText = null;
+        m_detailedText = null;
+        m_buttonsList = null;
+        m_dialog = null;
+        m_handler = 0;
+    }
+
+    private Activity m_activity;
+    private int m_icon = 0;
+    private String m_title, m_text, m_informativeText, m_detailedText;
+    private ArrayList<ButtonStruct> m_buttonsList;
+    private AlertDialog m_dialog;
+    private long m_handler = 0;
+    private Resources.Theme m_theme;
+}