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

Conflicts:
	examples/corelib/ipc/ipc.pro
	src/plugins/platforms/xcb/qxcbbackingstore.cpp
	tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp

Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf

3 files changed, 33 insertions, 15 deletions

diff --git a/util/glgen/qopenglextensions.cpp.header b/util/glgen/qopenglextensions.cpp.header
index 1127d0bb20..1d23f3cc65 100644
--- a/util/glgen/qopenglextensions.cpp.header
+++ b/util/glgen/qopenglextensions.cpp.header
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB)
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, 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
diff --git a/util/glgen/qopenglextensions.h.header b/util/glgen/qopenglextensions.h.header
index 8355163dcd..45cb2c9b90 100644
--- a/util/glgen/qopenglextensions.h.header
+++ b/util/glgen/qopenglextensions.h.header
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB)
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, 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
diff --git a/util/local_database/cldr2qtimezone.py b/util/local_database/cldr2qtimezone.py
index c6dcc807f9..502ab92fd5 100644
--- a/util/local_database/cldr2qtimezone.py
+++ b/util/local_database/cldr2qtimezone.py
@@ -153,7 +153,7 @@ windowsIdList = {
    65 : [ u'North Asia East Standard Time',    28800  ],
    66 : [ u'North Asia Standard Time',         25200  ],
    67 : [ u'Pacific SA Standard Time',        -10800  ],
-   68 : [ u'Pacific Standard Time (Mexico)',  -28800  ],
+   68 : [ u'E. Europe Standard Time',           7200  ],
    69 : [ u'Pacific Standard Time',           -28800  ],
    70 : [ u'Pakistan Standard Time',           18000  ],
    71 : [ u'Paraguay Standard Time',          -14400  ],
@@ -190,7 +190,8 @@ windowsIdList = {
    102: [ u'W. Europe Standard Time',           3600  ],
    103: [ u'West Asia Standard Time',          18000  ],
    104: [ u'West Pacific Standard Time',       36000  ],
-   105: [ u'Yakutsk Standard Time',            32400  ]
+   105: [ u'Yakutsk Standard Time',            32400  ],
+   106: [ u'North Korea Standard Time',        30600  ]
 }
 
 def windowsIdToKey(windowsId):
@@ -241,7 +242,8 @@ utcIdList = {
    35 : [ u'UTC+11:00',  39600  ],
    36 : [ u'UTC+12:00',  43200  ],
    37 : [ u'UTC+13:00',  46800  ],
-   38 : [ u'UTC+14:00',  50400  ]
+   38 : [ u'UTC+14:00',  50400  ],
+   39 : [ u'UTC+08:30',  30600  ]
 }
 
 def usage():
@@ -276,9 +278,6 @@ for line in ldml:
 # [[u'version', [(u'number', u'$Revision: 7825 $')]]]
 versionNumber = findTagsInFile(windowsZonesPath, "version")[0][1][0][1]
 
-# [[u'generation', [(u'date', u'$Date: 2012-10-10 14:45:31 -0700 (Wed, 10 Oct 2012) $')]]]
-generationDate = findTagsInFile(windowsZonesPath, "generation")[0][1][0][1]
-
 mapTimezones = findTagsInFile(windowsZonesPath, "windowsZones/mapTimezones")
 
 defaultDict = {}
@@ -332,13 +331,12 @@ newTempFile.write(GENERATED_BLOCK_START)
 newTempFile.write("\n\
 /*\n\
     This part of the file was generated on %s from the\n\
-    Common Locale Data Repository v%s supplemental/windowsZones.xml file\n\
-    %s %s\n\
+    Common Locale Data Repository v%s supplemental/windowsZones.xml file %s\n\
 \n\
     http://www.unicode.org/cldr/\n\
 \n\
     Do not change this data, only generate it using cldr2qtimezone.py.\n\
-*/\n\n" % (str(datetime.date.today()), cldr_version, versionNumber, generationDate) )
+*/\n\n" % (str(datetime.date.today()), cldr_version, versionNumber) )
 
 windowsIdData = ByteArrayData()
 ianaIdData = ByteArrayData()