From 709d00b676b9057ffe0ec94578f1a5d4e26bbe9d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 24 Jan 2018 14:51:57 +0100
Subject: Remove examples submodule

Change-Id: I0e4e3472e1d5644db281fb46ce4ba4ddfc1eafae
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .gitmodules                              | 4 ----
 MANIFEST.in                              | 4 ----
 prepare_coin_sources.py                  | 3 +--
 setup.py                                 | 8 --------
 sources/pyside2-examples                 | 1 -
 sources/pyside2/libpyside/CMakeLists.txt | 5 +----
 6 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 160000 sources/pyside2-examples

diff --git a/.gitmodules b/.gitmodules
index 43f7023fb..435806e6b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
 	path = sources/pyside2-tools
 	branch = 5.9
 	url = ../pyside-tools.git
-[submodule "sources/pyside2-examples"]
-	path = sources/pyside2-examples
-	branch = 5.9
-	url = ../examples.git
 [submodule "wiki"]
 	path = wiki
 	url = https://github.com/PySide/pyside2.wiki.git
diff --git a/MANIFEST.in b/MANIFEST.in
index 87d6b1cbe..dd79b2380 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,14 +17,10 @@ recursive-include sources/patchelf **
 recursive-include sources/shiboken2 **
 recursive-include sources/pyside2 **
 recursive-include sources/pyside2-tools **
-recursive-include sources/pyside2-examples **
-recursive-exclude sources/pyside2-examples/examples/hyperui **
-recursive-exclude sources/pyside2examples/mobility **
 # ignore .git
 recursive-exclude sources/shiboken2/.git **
 recursive-exclude sources/pyside2/.git **
 recursive-exclude sources/pyside2-tools/.git **
-recursive-exclude sources/pyside2-examples/.git **
 
 # PySide package
 recursive-include pyside_package/PySide2 **
diff --git a/prepare_coin_sources.py b/prepare_coin_sources.py
index 24dae1551..7ef291d77 100644
--- a/prepare_coin_sources.py
+++ b/prepare_coin_sources.py
@@ -51,8 +51,7 @@ QT_CI_TESTED_SUBMODULE = option_value("module")
 SUBMODULE_BRANCH = option_value("branch")
 
 submodules = {
-        "pyside2-tools" : "pyside-tools",
-        "pyside2-examples" : "examples"
+        "pyside2-tools" : "pyside-tools"
 }
 
 def usage():
diff --git a/setup.py b/setup.py
index a348ee383..487d420a9 100644
--- a/setup.py
+++ b/setup.py
@@ -102,12 +102,10 @@ containedModules = ['shiboken2', 'pyside2']
 submodules = {
     '2.0.0.dev0': [
         ["pyside2-tools", "dev"],
-        ["pyside2-examples", "dev"],
         ["wiki", "master", ".."],
     ],
     '5.9': [
         ["pyside2-tools", "5.9"],
-        ["pyside2-examples", "5.9"],
         ["wiki", "master", ".."]
     ],
     '5.6': [
@@ -365,12 +363,6 @@ Use --list-versions option to get list of available versions""" % OPTION_VERSION
         sys.exit(1)
     __version__ = OPTION_VERSION
 
-if OPTION_NOEXAMPLES:
-    # remove pyside2-exampes from submodules so they will not be included
-    for idx, item in enumerate(submodules[__version__]):
-        if item[0].startswith('pyside2-examples'):
-            del submodules[__version__][idx]
-
 # Return a prefix suitable for the _install/_build directory
 def prefix():
     virtualEnvName = os.environ.get('VIRTUAL_ENV', None)
diff --git a/sources/pyside2-examples b/sources/pyside2-examples
deleted file mode 160000
index 4b67ddd2e..000000000
--- a/sources/pyside2-examples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b67ddd2e0c9600a145c6bef8ff952e3b4fc3e77
diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt
index de29269a4..0e21f4063 100644
--- a/sources/pyside2/libpyside/CMakeLists.txt
+++ b/sources/pyside2/libpyside/CMakeLists.txt
@@ -76,13 +76,10 @@ endmacro()
 # Test files.
 file(GLOB_RECURSE pyside_folder_py_files "../*.py")
 
-# Example files.
-file(GLOB_RECURSE example_folder_py_files "../../pyside2-examples/*.py")
-
 # Mostly for setup.py.
 file(GLOB setup_folder_py_files "../../../*.py")
 
-set(other_files ${pyside_folder_py_files} ${example_folder_py_files} ${setup_folder_py_files})
+set(other_files ${pyside_folder_py_files} ${setup_folder_py_files})
 add_other_files(${other_files})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-- 
cgit v1.2.3