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

Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f

1 files changed, 0 insertions, 94 deletions

diff --git a/examples/webkit/webkit-guide/js/storage.js b/examples/webkit/webkit-guide/js/storage.js
deleted file mode 100644
index b5a374f39d..0000000000
--- a/examples/webkit/webkit-guide/js/storage.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt WebKit module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-var app = new Function();
-
-app.dbg = false;
-
-window.onload = function() {
-
-    app.cred = document.querySelector('#cred');
-
-    // open form:
-    document.querySelector('#openform').addEventListener('mousedown', app.getInfo);
-    // dismiss form:
-    document.querySelector('#dismiss').addEventListener('mousedown', app.dismiss);
-
-    // form validation:
-    app.inputs = document.querySelectorAll('input:not([type="submit"])');
-    for (var i = 0, l = app.inputs.length ; i < l ; i++ ) {
-        app.inputs[i].addEventListener('blur', app.checkEdit);
-    }
-
-    // storage
-    app.db_loc = window.localStorage;
-    app.db_ses = window.sessionStorage;
-
-    if (!!app.db_loc) {
-        // no login info yet...
-        if ( !app.db_loc.getItem('login') || !app.db_loc.getItem('password') ) app.getInfo();
-    }
-    else {
-        alert("This application needs to run on a recent WebKit-based browser.");
-    }
-
-};
-
-app.hint = function(str) {
-    document.querySelector('body').className = str;
-};
-
-app.checkEdit = function(ev) {
-    ev.currentTarget.className = 'validate';
-}
-
-app.getInfo = function(ev) {
-    app.cred.className = 'show';
-    app.inputs[0].value = app.db_loc.getItem('login');
-    app.inputs[1].value = app.db_loc.getItem('password');
-    app.inputs[2].value = app.db_ses.getItem('credit');
-}
-
-app.dismiss = function(ev) {
-    app.db_loc.setItem('login', app.inputs[0].value);
-    app.db_loc.setItem('password', app.inputs[1].value);
-    app.db_ses.setItem('credit', app.inputs[2].value);
-    ev.currentTarget.parentNode.className = 'hide';
-}
-