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

Conflicts:
	tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp

Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754

4 files changed, 107 insertions, 1 deletions

diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index d6c3cd8048..c04f22b53b 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -41,7 +41,8 @@ widgetgrab \
 xembed-raster \
 xembed-widgets \
 dialogs \
-windowtransparency
+windowtransparency \
+unc
 
 !contains(QT_CONFIG, openssl):!contains(QT_CONFIG, openssl-linked):SUBDIRS -= qssloptions
 
diff --git a/tests/manual/unc/main.cpp b/tests/manual/unc/main.cpp
new file mode 100644
index 0000000000..51ceb87e28
--- /dev/null
+++ b/tests/manual/unc/main.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite 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 <QApplication>
+#include <QDialog>
+#include <QVBoxLayout>
+#include <QLabel>
+
+class Dialog : public QDialog
+{
+public:
+    Dialog()
+    {
+        QString localFile("test.html");
+        // server/shared/test.html should be replaced to point to a real file
+        QString UNCPath("file://server/shared/test.html");
+
+        QVBoxLayout* vBox = new QVBoxLayout();
+        vBox->addWidget(new QLabel("Clicking on the links should open their"
+                                   " contents in the default browser !"));
+        vBox->addWidget(createLink(localFile));
+        vBox->addWidget(new QLabel("The following link must point to "
+                                   "a file in a shared folder on a network !"));
+        vBox->addWidget(createLink(UNCPath));
+        setLayout(vBox);
+    }
+
+protected:
+    QLabel* createLink(QString path)
+    {
+        QLabel *label = new QLabel();
+        label->setTextFormat(Qt::RichText);
+        label->setTextInteractionFlags(Qt::TextBrowserInteraction);
+        label->setOpenExternalLinks(true);
+
+        QString link("<a href=" + path + ">" + path + "</a>");
+
+        label->setText(link);
+        return label;
+    }
+};
+
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+
+    Dialog dlg;
+    dlg.show();
+
+    return app.exec();
+}
diff --git a/tests/manual/unc/test.html b/tests/manual/unc/test.html
new file mode 100644
index 0000000000..2e84ad5385
--- /dev/null
+++ b/tests/manual/unc/test.html
@@ -0,0 +1,10 @@
+<HTML>
+   <HEAD>
+      <TITLE>
+         A Small Hello
+      </TITLE>
+   </HEAD>
+<BODY>
+   <P>This is first html document.</P>
+</BODY>
+</HTML>
diff --git a/tests/manual/unc/unc.pro b/tests/manual/unc/unc.pro
new file mode 100644
index 0000000000..977bd0c177
--- /dev/null
+++ b/tests/manual/unc/unc.pro
@@ -0,0 +1,6 @@
+QT += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TEMPLATE = app
+
+SOURCES += main.cpp