Fixed module import for python 3.8

Fixed import module for windows and python 3.7

.codespellrc

@@ -1,4 +1,4 @@
 [codespell]
-skip = ./build-*,.git
+skip = ./build-*,.git,*.svg,rc_assets.py
 interactive = 3
 ignore-words-list = overlay,overlayed

CMakeLists.txt

@@ -207,16 +207,16 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
 
   string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" compileflags)
   if("${CMAKE_CXX_FLAGS} ${${compileflags}}" MATCHES "-fsanitize")
-      set(sanitizers_enabled TRUE)
+    set(sanitizers_enabled TRUE)
   else()
-      set(sanitizers_enabled FALSE)
+    set(sanitizers_enabled FALSE)
   endif()
 
   # cannot enable this for clang + sanitizers
-  if (NOT sanitizers_enabled OR NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      # Do not allow undefined symbols, even in non-symbolic shared libraries
-      set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
-      set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}")
+  if(NOT sanitizers_enabled OR NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # Do not allow undefined symbols, even in non-symbolic shared libraries
+    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}")
   endif()
 endif()
 
@@ -267,13 +267,6 @@ endif()
 
 add_subdirectory(src)
 
-if(${PROJECT_NAME}_PYTHON_BINDINGS)
-  if(CMAKE_BUILD_TYPE MATCHES "^[Dd]eb" OR ${PROJECT_NAME}_STATIC)
-    message(FATAL_ERROR "** Python Bindings are disabled in debug or static builds.")
-  endif()
-  add_subdirectory(python)
-endif()
-
 if(${PROJECT_NAME}_IS_ROOT_PROJECT)
   if(${PROJECT_NAME}_EXAMPLES)
     if(${PROJECT_NAME}_QTQUICK)
@@ -339,4 +332,11 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT)
   include(ECMUninstallTarget)
 endif()
 
+if(${PROJECT_NAME}_PYTHON_BINDINGS)
+  if(CMAKE_BUILD_TYPE MATCHES "^[Dd]eb" OR ${PROJECT_NAME}_STATIC)
+    message(FATAL_ERROR "** Python Bindings are disabled in debug or static builds.")
+  endif()
+  add_subdirectory(python)
+endif()
+
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

cmake/KDAB/modules/PySide2ModuleBuild.cmake

@@ -129,8 +129,12 @@ macro(CREATE_PYTHON_BINDINGS
             PREFIX ""
             OUTPUT_NAME ${MODULE_NAME}
             LIBRARY_OUTPUT_DIRECTORY ${MODULE_OUTPUT_DIR}
-            INSTALL_RPATH "$ORIGIN"
         )
+        if(APPLE)
+            set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@loader_path")
+        elseif(NOT WIN32) #ie. linux
+            set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN")
+        endif()
 
         if(WIN32)
             set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX ".pyd")

cmake/KDAB/modules/PySide6ModuleBuild.cmake

@@ -130,6 +130,11 @@ macro(CREATE_PYTHON_BINDINGS
             OUTPUT_NAME ${MODULE_NAME}
             LIBRARY_OUTPUT_DIRECTORY ${MODULE_OUTPUT_DIR}
         )
+        if(APPLE)
+            set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@loader_path")
+        elseif(NOT WIN32) #ie. linux
+            set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN")
+        endif()
 
         if(WIN32)
             set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX ".pyd")

examples/dockwidgets/MyTitleBar_CSS.h

@@ -9,13 +9,18 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
+#ifndef EXAMPLETITLEBAR_CSS_H
+#define EXAMPLETITLEBAR_CSS_H
+
+#pragma once
+
 #include <kddockwidgets/private/widgets/TitleBarWidget_p.h>
 
 /**
  * @brief Shows how to implement a custom titlebar which uses "Qt StyleSheets".
- * 
+ *
  * Derive from KDDockWidgets::DefaultWidgetFactory and override the two createTitleBar() methods.
- * 
+ *
  * To try it out, modify examples/dockwidgets/MyFrameworkWidgetFactory.cpp to return a MyTitleBar_CSS instance.
  * Run the example with: ./bin/kddockwidgets_example -p
  *
@@ -77,3 +82,5 @@ public:
 MyTitleBar_CSS::~MyTitleBar_CSS()
 {
 }
+
+#endif

python/CMakeLists.txt

@@ -39,3 +39,4 @@ set(${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX "${${PROJECT_NAME}_PYTHON_BIN
 
 include(PySide${PYSIDE_MAJOR_VERSION}ModuleBuild)
 add_subdirectory(PyKDDockWidgets)
+add_subdirectory(tests)

python/PyKDDockWidgets/CMakeLists.txt

@@ -82,10 +82,18 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.cmake ${CMAKE_CURRENT_BIN
 
 # install
 install(
+  FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/__init__.py
+    $<TARGET_FILE:KDAB::kddockwidgets>
+  DESTINATION
+    ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}
+)
+if(NOT WIN32)
+  install(
     FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/__init__.py
         $<TARGET_LINKER_FILE:KDAB::kddockwidgets>
         $<TARGET_SONAME_FILE:KDAB::kddockwidgets>
-        $<TARGET_FILE:KDAB::kddockwidgets>
     DESTINATION
-        ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX})
+        ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}
+  )
+endif()

python/PyKDDockWidgets/__init__.py.cmake

@@ -15,9 +15,22 @@ import os
 __all__ = ['KDDockWidgets']
 
 def setupLibraryPath():
-    package_dir = os.path.abspath(os.path.dirname(__file__))
-    if sys.platform == 'win32':
-        os.add_dll_directory(package_dir)
+    if sys.platform != 'win32':
+        return
+
+    from shiboken2 import shiboken2
+    from PySide@PYSIDE_MAJOR_VERSION@ import QtCore
+
+    extra_dll_dirs = [ os.path.abspath(os.path.dirname(shiboken2.__file__)),
+                       os.path.abspath(os.path.dirname(QtCore.__file__)),
+                       os.path.abspath(os.path.dirname(__file__)) ]
+
+    if sys.version_info[0] == 3 and sys.version_info[1] >= 8:
+        for dll_dir in extra_dll_dirs:
+            os.add_dll_directory(dll_dir)
+
+    for dll_dir in extra_dll_dirs:
+        os.environ['PATH'] = os.fspath(dll_dir) + os.pathsep + os.environ['PATH']
 
 # Preload PySide libraries to avoid missing libraries while loading KDDockWidgets
 try:

python/examples-qt6/main.py

@@ -15,7 +15,7 @@ from MyMainWindow import MyMainWindow
 from PySide6 import QtWidgets, QtCore
 
 import sys
-import rc_assets
+#import rc_assets
 
 if __name__ == "__main__":
     QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)

python/tests/CMakeLists.txt

@@ -0,0 +1,40 @@
+#
+# This file is part of KDDockWidgets.
+#
+# SPDX-FileCopyrightText: 2020-2021 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+# Author: Renato Araujo Oliveira Filho <renato.araujo@kdab.com>
+#
+# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+#
+# Contact KDAB at <info@kdab.com> for commercial licensing options.
+#
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.py.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.py @ONLY)
+
+set(TEST_PYTHONPATH
+    ${CMAKE_BINARY_DIR}/python
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+set(TEST_LIBRARYPATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+
+if(WIN32)
+  set(TEST_LIBRARY_VAR "PATH")
+  string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}")
+  string(REPLACE "\\" "/" TEST_LIBRARYPATH "${TEST_LIBRARYPATH}")
+  list(JOIN TEST_PYTHONPATH "\\;" TEST_PYTHONPATH)
+  list(JOIN TEST_LIBRARYPATH "\\;" TEST_LIBRARYPATH)
+else()
+  set(TEST_LIBRARY_VAR "LD_LIBRARY_PATH")
+  list(JOIN TEST_PYTHONPATH ":" TEST_PYTHONPATH)
+  list(JOIN TEST_LIBRARYPATH ":" TEST_LIBRARYPATH)
+endif()
+
+set(PYTHON_ENV_COMMON "PYTHONPATH=${TEST_PYTHONPATH};${TEST_LIBRARY_VAR}=${TEST_LIBRARYPATH}")
+
+file(GLOB TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tst_*.py)
+foreach(test_file ${TEST_FILES})
+  get_filename_component(test_name ${test_file} NAME_WE)
+  add_test(${test_name} ${Python3_EXECUTABLE} ${test_file})
+  set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "${PYTHON_ENV_COMMON}")
+endforeach()
+

python/tests/config.py.cmake

@@ -0,0 +1,19 @@
+# This file is part of KDDockWidgets.
+#
+# SPDX-FileCopyrightText: 2021 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+# Author: Renato Araujo <renato.araujo@kdab.com>
+#
+# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+#
+# Contact KDAB at <info@kdab.com> for commercial licensing options.
+#
+
+import os
+import sys
+
+class TstConfig(object):
+    bindingsNamespace = "@PYTHON_BINDING_NAMESPACE@"
+
+    def initLibraryPath():
+        if sys.platform == 'win32' and sys.version_info[0] == 3 and sys.version_info[1] >= 8:
+            os.add_dll_directory("@CMAKE_RUNTIME_OUTPUT_DIRECTORY@")

python/tests/tst_importModule.py

@@ -0,0 +1,30 @@
+# This file is part of KDDockWidgets.
+#
+# SPDX-FileCopyrightText: 2021 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+# Author: Renato Araujo <renato.araujo@kdab.com>
+#
+# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+#
+# Contact KDAB at <info@kdab.com> for commercial licensing options.
+#
+
+import unittest
+import importlib
+import inspect
+
+from config import TstConfig
+
+class TestImportModules(unittest.TestCase):
+    def test_importModules(self):
+        m = importlib.import_module(TstConfig.bindingsNamespace + '.KDDockWidgets')
+        moduleSymbols = []
+        for t in inspect.getmembers(m):
+            moduleSymbols.append(t[0])
+
+        symbols = ['MainWindow', 'DockWidget']
+        for symbol in symbols:
+            self.assertIn(symbol, moduleSymbols)
+
+if __name__ == '__main__':
+    TstConfig.initLibraryPath()
+    unittest.main()

src/private/FloatingWindow_p.h

@@ -205,7 +205,7 @@ public:
 
     ///@brief By default equivalent to QWidget::normalGeometry()
     /// Derived classes can implement something different here, to workaround window manager issues with Qt::Tool
-    /// Also useful for QtQuick to eventually perserve normal geometry uppon save/restore of a maximized window. As
+    /// Also useful for QtQuick to eventually preserve normal geometry upon save/restore of a maximized window. As
     /// QWindow has no notion of normal geometry, so we need to implement it here.
     /// @sa QTBUG-95478
     virtual QRect normalGeometry() const;

src/private/widgets/TabWidgetWidget.cpp

@@ -212,7 +212,7 @@ void TabWidgetWidget::showContextMenu(QPoint pos)
         return;
 
     QTabBar *tabBar = QTabWidget::tabBar();
-    // We dont want context menu if there is only one tab
+    // We don't want context menu if there is only one tab
     if (tabBar->count() <= 1)
         return;
 

tests/fuzzer/Operations.cpp

@@ -27,9 +27,9 @@ using namespace KDDockWidgets;
 using namespace KDDockWidgets::Testing;
 using namespace KDDockWidgets::Testing::Operations;
 
-static QString operationTypeStr(OperationType ot)
+static QString operationTypeStr(OperationType optype)
 {
-    return QMetaEnum::fromType<OperationType>().valueToKey(ot);
+    return QMetaEnum::fromType<OperationType>().valueToKey(optype);
 }
 
 OperationBase::OperationBase(KDDockWidgets::Testing::Operations::OperationType type, Fuzzer *fuzzer)