diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | build_scripts/config.py | 2 | ||||
| -rw-r--r-- | build_scripts/main.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 3 | ||||
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 1 |
6 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 595489dfa..d8a43604d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,4 +20,3 @@ add_subdirectory(sources/pyside2) # Semi-hack to include exported pyside2 variables. list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/pyside2/libpyside") -add_subdirectory(sources/pyside2-tools) diff --git a/build_scripts/config.py b/build_scripts/config.py index 4ec2af3de..ae09ed8a3 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -331,7 +331,7 @@ class Config(object): if self.is_internal_shiboken_module_build() or self.is_internal_shiboken_generator_build(): return ['shiboken2'] elif self.is_internal_pyside_build(): - return ['pyside2', 'pyside2-tools'] + return ['pyside2'] return None def set_is_top_level_invocation(self): diff --git a/build_scripts/main.py b/build_scripts/main.py index 99cc02185..a771e2d32 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -1015,7 +1015,7 @@ class PysideBuild(_build): timestamp = get_package_timestamp() cmake_cmd.append("-DPACKAGE_SETUP_PY_PACKAGE_TIMESTAMP={}".format(timestamp)) - if extension.lower() in ["shiboken2", "pyside2-tools"]: + if extension.lower() in ["shiboken2"]: cmake_cmd.append("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=yes") if sys.version_info[0] > 2: cmake_cmd.append("-DUSE_PYTHON_VERSION=3.3") diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index b842510ff..754cdc961 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -204,7 +204,7 @@ def prepare_packages_posix(self, vars): # compatibility if sys.version_info[0] == 3: examples_path = "{st_build_dir}/{st_package_name}/examples".format(**vars) - pyside_rcc_path = "{install_dir}/bin/rcc".format(**vars) + pyside_rcc_path = "rcc" pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 49c384bc7..f8a776b87 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -220,8 +220,7 @@ def prepare_packages_win32(self, vars): if sys.version_info[0] == 3: examples_path = "{st_build_dir}/{st_package_name}/examples".format( **vars) - pyside_rcc_path = "{install_dir}/bin/rcc.exe".format( - **vars) + pyside_rcc_path = "rcc.exe" pyside_rcc_options = ['-g', 'python'] regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index dc2beded0..484f02f0d 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -84,7 +84,6 @@ add_definitions(${Qt${QT_MAJOR_VERSION}Core_DEFINITIONS}) find_file(GL_H "gl.h" PATH_SUFFIXES "GL") message(STATUS "GL Headers path:" "${GL_H}") -include(FindQt5Extra) set(XVFB_EXEC "") option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtGui tests popping windows on the screen." FALSE) |