From 94dd6e146f3cc63c5b80ad7cd2ee5221b9502265 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 2 Aug 2017 13:55:04 +0200
Subject: Add QTimeZone

Task-number: PYSIDE-487
Change-Id: I9a2c19c6b8415e3f608531b315a6841eb3de55f5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 sources/pyside2/PySide2/QtCore/CMakeLists.txt      |  2 +
 .../PySide2/QtCore/typesystem_core_common.xml      |  6 +++
 sources/pyside2/tests/QtCore/CMakeLists.txt        |  1 +
 sources/pyside2/tests/QtCore/qtimezone_test.py     | 43 ++++++++++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 sources/pyside2/tests/QtCore/qtimezone_test.py

(limited to 'sources/pyside2')

diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
index 4e833f584..5e3c16a08 100644
--- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
@@ -136,6 +136,8 @@ ${QtCore_GEN_DIR}/qtime_wrapper.cpp
 ${QtCore_GEN_DIR}/qtimeline_wrapper.cpp
 ${QtCore_GEN_DIR}/qtimer_wrapper.cpp
 ${QtCore_GEN_DIR}/qtimerevent_wrapper.cpp
+${QtCore_GEN_DIR}/qtimezone_wrapper.cpp
+${QtCore_GEN_DIR}/qtimezone_offsetdata_wrapper.cpp
 ${QtCore_GEN_DIR}/qtranslator_wrapper.cpp
 ${QtCore_GEN_DIR}/qurl_wrapper.cpp
 ${QtCore_GEN_DIR}/qvariantanimation_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index e81eb7e21..f3bf41923 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1748,6 +1748,12 @@
     </modify-function>
   </value-type>
   
+  <value-type name="QTimeZone">
+    <enum-type name="TimeType"/>
+    <enum-type name="NameType"/>
+    <value-type name="OffsetData"/>
+  </value-type>
+
   <!-- FIXME QT5: Remove QUuid because cyclic dependency found on overloaddata QUuid(), 
   this lead to cyclic dependency in <<(QDataStream &, QUUid) and incorrect QDataStream code generation (Windows only)-->
   <!-- <value-type name="QUuid">
diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt
index 436af3dac..0a3fda0bb 100644
--- a/sources/pyside2/tests/QtCore/CMakeLists.txt
+++ b/sources/pyside2/tests/QtCore/CMakeLists.txt
@@ -102,6 +102,7 @@ PYSIDE_TEST(qthread_signal_test.py)
 PYSIDE_TEST(qthread_test.py)
 PYSIDE_TEST(qtimer_singleshot_test.py)
 PYSIDE_TEST(qtimer_timeout_test.py)
+PYSIDE_TEST(qtimezone_test.py)
 PYSIDE_TEST(qtnamespace_test.py)
 PYSIDE_TEST(qurl_test.py)
 PYSIDE_TEST(repr_test.py)
diff --git a/sources/pyside2/tests/QtCore/qtimezone_test.py b/sources/pyside2/tests/QtCore/qtimezone_test.py
new file mode 100644
index 000000000..e0bebdfbf
--- /dev/null
+++ b/sources/pyside2/tests/QtCore/qtimezone_test.py
@@ -0,0 +1,43 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of PySide2.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## 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.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import unittest
+
+from PySide2.QtCore import QTimeZone
+
+class TestQTimeZone (unittest.TestCase):
+    def testTimeZone(self):
+        id = 'Europe/Berlin'
+        timeZone = QTimeZone(id)
+        self.assertTrue(timeZone.isValid())
+        self.assertEqual(timeZone.id(), id)
+        name = timeZone.displayName(QTimeZone.GenericTime, QTimeZone.DefaultName)
+        self.assertTrue(name)
+
+if __name__ == '__main__':
+    unittest.main()
-- 
cgit v1.2.3


From 8aca0dec116c6b321373f5636b34036530ac6e4b Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 10 Aug 2017 11:29:22 +0200
Subject: Add commit info and build date to installed package

This change adds four new properties to the top-level PySide2 package:
__build_date__ - the date when the package was built in iso8601 format
__build_commit_date__ - the date of the top-level commit used to
                        build the package
__build_commit_hash__ - the SHA1 hash of the top-level commit
__build_commit_hash_described__ - the result of 'git describe commmit'

If git is not found on the system when the build is done, the last
three properties will not be present.

Note that all this info is computed at cmake configuration time, which
means that currently the properties will not be updated unless the
CMakeLists.txt file is touched, or a full reconfiguration is done.
If PySide2 is built using the setup.py script, the cmake
reconfiguration is always done.

Task-number: PYSIDE-557
Change-Id: I7db67fa34973e7976b21e3d1d36237577b3c6e32
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/CMakeLists.txt         | 46 ++++++++++++++++++++++++++++++++++
 sources/pyside2/PySide2/__init__.py.in |  4 +++
 2 files changed, 50 insertions(+)

(limited to 'sources/pyside2')

diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index 7799c0c7a..f5e4102c4 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -159,6 +159,52 @@ else()
         CACHE STRING "PySide version [full]" FORCE)
 endif()
 
+string(TIMESTAMP PYSIDE_BUILD_DATE "%Y-%m-%dT%H:%M:%S+00:00" UTC)
+if (PYSIDE_BUILD_DATE)
+    set(PYSIDE_BUILD_DATE "__build_date__ = '${PYSIDE_BUILD_DATE}'")
+endif()
+
+find_package(Git)
+if(GIT_FOUND)
+    # Check if current source folder is inside a git repo, so that commit information can be
+    # queried.
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
+      OUTPUT_VARIABLE PYSIDE_SOURCE_IS_INSIDE_REPO
+      ERROR_QUIET
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if(PYSIDE_SOURCE_IS_INSIDE_REPO)
+        # Force git dates to be UTC-based.
+        set(ENV{TZ} UTC)
+        execute_process(
+          COMMAND ${GIT_EXECUTABLE} --no-pager show --date=format-local:%Y-%m-%dT%H:%M:%S+00:00 -s --format=%cd HEAD
+          OUTPUT_VARIABLE PYSIDE_BUILD_COMMIT_DATE
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(PYSIDE_BUILD_COMMIT_DATE)
+            set(PYSIDE_BUILD_COMMIT_DATE "__build_commit_date__ = '${PYSIDE_BUILD_COMMIT_DATE}'")
+        endif()
+        unset(ENV{TZ})
+
+        execute_process(
+          COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+          OUTPUT_VARIABLE PYSIDE_BUILD_COMMIT_HASH
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(PYSIDE_BUILD_COMMIT_HASH)
+            set(PYSIDE_BUILD_COMMIT_HASH "__build_commit_hash__ = '${PYSIDE_BUILD_COMMIT_HASH}'")
+        endif()
+
+        execute_process(
+          COMMAND ${GIT_EXECUTABLE} describe HEAD
+          OUTPUT_VARIABLE PYSIDE_BUILD_COMMIT_HASH_DESCRIBED
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(PYSIDE_BUILD_COMMIT_HASH_DESCRIBED)
+            set(PYSIDE_BUILD_COMMIT_HASH_DESCRIBED "__build_commit_hash_described__ = '${PYSIDE_BUILD_COMMIT_HASH_DESCRIBED}'")
+        endif()
+
+    endif()
+endif()
+
 include(PySideModules)
 
 macro(COLLECT_MODULE_IF_FOUND shortname)
diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in
index 99deb35e2..ffe017587 100644
--- a/sources/pyside2/PySide2/__init__.py.in
+++ b/sources/pyside2/PySide2/__init__.py.in
@@ -4,6 +4,10 @@ __all__ = list("Qt" + body for body in
 __version__         = "@BINDING_API_VERSION_FULL@"
 __version_info__    = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @BINDING_API_MICRO_VERSION@, "@BINDING_API_RELEASE_LEVEL@", @BINDING_API_SERIAL@)
 
+@PYSIDE_BUILD_DATE@
+@PYSIDE_BUILD_COMMIT_DATE@
+@PYSIDE_BUILD_COMMIT_HASH@
+@PYSIDE_BUILD_COMMIT_HASH_DESCRIBED@
 
 def _setupQtDirectories():
     import sys
-- 
cgit v1.2.3