Improved documentation for Linux support

2021-01-03 17:27:01 +01:00
257 changed files with 5232 additions and 17288 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -0,0 +1,155 @@
+version: '{build}'
+branches:
+  only:
+    - master
+
+image: Visual Studio 2017
+
+environment:
+  global:
+    # Appveyor doesn't have Qt 12 yet
+    LatestQtVersion: 5.13
+  matrix:
+
+# 32 bit builds
+# MinGW builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 32bit, MinGW, qmake
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
+    COMPILER: C:\Qt\Tools\mingw730_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 32bit, MinGW, cmake
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
+    COMPILER: C:\Qt\Tools\mingw730_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "false"
+    use_cmake: "true"
+# end Dynamic Library builds
+# Static Library builds
+    # LTS version of Qt, static, 32bit, MinGW, qmake
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
+    COMPILER: C:\Qt\Tools\mingw730_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 32bit, MinGW, cmake
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
+    COMPILER: C:\Qt\Tools\mingw730_32
+    targetPlatform: x86
+    use_mingw: "true"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MinGW builds
+# MSVC 2017 builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 32bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 32bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "true"
+# end Dynamic Library builds
+# Static Library builds
+    # LTS version of Qt, static, 32bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 32bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MSVC 2017 builds
+# end 32 bit builds
+
+# 64 bit builds
+# MSVC 2017 builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 64bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 64bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "true"
+# end Dynamic Library builds
+# Static Library builds
+    # LTS version of Qt, static, 64bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 64bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: amd64
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MSVC 2017 builds
+# end 64 bit builds
+
+
+matrix:
+  fast_finish: true
+
+before_build:
+- set originalWD=%CD%
+- call "%QT%\bin\qtenv2.bat"
+- cd /D %originalWD%
+- if %use_mingw%==false call "%COMPILER%\vcvarsall.bat" %targetPlatform%
+- if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
+- if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
+- if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
+- if %use_mingw%==true set PATH=%PATH%:C:\Program Files\Git\usr\bin;=%
+
+build_script:
+- echo %PATH%
+- if %use_cmake%==true mkdir build 
+- if %use_cmake%==true cd build
+- if %use_cmake%==true cmake --version
+- if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
+- if %use_cmake%==true cmake --build .
+- if %use_cmake%==true cmake --build . --target install
+- if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
+- if %use_cmake%==true cmake --build .
+- if %use_cmake%==true cmake --build . --target install
+- if %use_cmake%==false if %use_static%==true qmake "CONFIG+=adsBuildStatic"
+- if %use_cmake%==false if %use_static%==false qmake
+- if %use_cmake%==false %MAKEENGINE% debug
+- if %use_cmake%==false %MAKEENGINE% install
+- if %use_cmake%==false %MAKEENGINE% release
+- if %use_cmake%==false %MAKEENGINE% install
+
+after_build:
+- if %use_mingw%==true set PATH=C:\Program Files\Git\usr\bin;%PATH%
--- a/.clang-format
+++ b/.clang-format
@@ -1,146 +0,0 @@
---
-AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: None
-AlignConsecutiveAssignments: None
-AlignConsecutiveDeclarations: None
-AlignEscapedNewlines: Right
-AlignOperands: Align
-AlignTrailingComments: true
-
-AllowAllArgumentsOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Never
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: InlineOnly
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLambdasOnASingleLine: Inline
-AllowShortLoopsOnASingleLine: false
-
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: Yes
-
-BinPackArguments: true
-BinPackParameters: true
-
-BraceWrapping:
-  AfterCaseLabel: true
-  AfterClass: true
-  AfterControlStatement: Always
-  AfterEnum: true
-  AfterFunction: true
-  AfterNamespace: true
-  AfterStruct: true
-  AfterUnion: true
-  AfterExternBlock: true
-  BeforeCatch: true
-  BeforeElse: true
-  BeforeLambdaBody: false
-  IndentBraces: false
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: false
-
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Custom
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializers: BeforeColon
-BreakInheritanceList: AfterColon
-BreakStringLiterals: true
-
-ColumnLimit: 82
-CommentPragmas: '^(!.*|@c)'
-
-CompactNamespaces: false
-
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-
-FixNamespaceComments: true
-
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex: '^<windows(\.h)?>'  # windows headers
-    Priority: -1
-  - Regex: '^<labbcan[[:alnum:]._/]+'  # labbcan headers
-    Priority: 1
-  - Regex: '^<diag[[:alnum:]._/]+'  # usl headers
-    Priority: 1
-  - Regex: '^<usl[[:alnum:]._/]+'  # usl headers
-    Priority: 1
-  - Regex: '^<qt5compat[[:alnum:]._/]+'  # qtlabb headers
-    Priority: 2
-  - Regex: '^<qtcoreaddons[[:alnum:]._/]+'  # qtlabb headers
-    Priority: 2
-  - Regex: '^<qtlabb[[:alnum:]._/]+'  # qtlabb headers
-    Priority: 2
-  - Regex: '<Q[[:alnum:].]+>'  # Qt headers
-    Priority: 3
-  - Regex: '^<sila_cpp[[:alnum:]._/]+'  # sila_cpp headers
-    Priority: 4
-  - Regex: '<[[:alnum:]._/]+\.h>'  # other headers
-    Priority: 5
-  - Regex: '<[[:alnum:]._/]+>'  # system headers
-    Priority: 6
-  - Regex: '.*'
-    Priority: 7
-
-IncludeIsMainRegex: '(_p)?$'
-
-IndentCaseBlocks: false
-IndentCaseLabels: false
-IndentPPDirectives: AfterHash
-IndentWidth: 4
-IndentWrappedFunctionNames: false
-
-KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 1
-
-NamespaceIndentation: None
-
-PenaltyBreakAssignment: 20
-PenaltyBreakBeforeFirstCallParameter: 15
-PenaltyBreakComment: 10
-PenaltyBreakFirstLessLess: 5
-# PenaltyBreakOpenParenthesis: 30
-PenaltyBreakString: 150
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 100
-PenaltyIndentedWhitespace: 0
-PenaltyReturnTypeOnItsOwnLine: 150
-
-PointerAlignment: Left
-ReflowComments: true
-
-SortIncludes: CaseSensitive
-SortUsingDeclarations: true
-
-SpaceAfterCStyleCast: false
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: false
-
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceBeforeSquareBrackets: false
-SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
-
-SpacesBeforeTrailingComments: 2
-SpacesInAngles: Never
-SpacesInCStyleCastParentheses: false
-SpacesInConditionalStatement: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-
-Standard: c++17
-
-StatementMacros: [ 'Q_UNUSED', 'PIMPL_D', 'PIMPL_Q', 'OD_ENTRY', 'OD_ENTRY_PROCIMG' ]
-
-TabWidth: 4
-UseTab: Never
--- a/.github/workflows/linux-builds.yml
+++ b/.github/workflows/linux-builds.yml
@@ -1,84 +1,23 @@
 name: linux-builds

-on:
-  push:
-  workflow_dispatch:
+on: [push]

-jobs:  
-  build_ubuntu_2204_cmake:
-    runs-on: ubuntu-22.04
-
-    env:
-      QT_VERSION: 6.4.2
-      QT_DIR: ${{ github.workspace }}/Qt
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-18.04, ubuntu-16.04]

+    runs-on: ${{ matrix.os }}
+    
    steps:
-    - name: Checkout source
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Fetch full history and tags
-
-    - name: Install dependencies
+    - uses: actions/checkout@v1
+    - name: install qt
      run: |
-        sudo apt-get update
-        sudo apt-get install -y build-essential cmake ninja-build libgl1-mesa-dev libxkbcommon-x11-0 libx11-dev
-
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v3
-      with:
-        version: ${{ env.QT_VERSION }}
-        target: desktop
-        host: linux
-        arch: gcc_64
-        dir: ${{ env.QT_DIR }}
-        setup-python: false
-
-    - name: Configure with CMake
-      run: |
-          cmake -S . -B build \
-            -DCMAKE_PREFIX_PATH="${{ env.QT_DIR }}/Qt/${{ env.QT_VERSION }}/gcc_64" \
-            -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \
-            -DCMAKE_BUILD_TYPE=Release \
-            -G Ninja
-
-    - name: Build
-      run: cmake --build build
-
-    - name: Run CMake install (optional)
-      run: cmake --install build
-
-  build_ubuntu_2204:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Cache Qt
-      id: cache-qt-6-4
-      uses: actions/cache@v3
-      with:
-        path: ../Qt/6.4.2
-        key: ${{ runner.os }}-QtCache-Qt6-4
-
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v2
-      with:
-        version: '6.4.2'
-        host: 'linux'
-        target: 'desktop'
-        install-deps: true
-        cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
-        setup-python: true
-        tools: ''
-        tools-only: false
-
-    - name: Install needed xkbcommon symlink
-      run: sudo apt-get install libxkbcommon-dev -y    
-
-    - name: Ubuntu and Qt version
-      run: |
-        cat /etc/issue
-        echo number of processors: $(nproc)
-        qmake -v
+        sudo apt-get update --fix-missing
+        sudo apt-get install qt5-default
+        sudo apt-get install libqt5x11extras5-dev
    - name: qmake
      run: qmake
    - name: make
-      run: make -j$(nproc)
+      run: make -j4
--- a/.github/workflows/windows-cmake.yml
+++ b/.github/workflows/windows-cmake.yml
@@ -1,102 +0,0 @@
-name: windows-builds
-
-on:
-  push:
-  workflow_dispatch:
-
-jobs:
-  build_windows_msvc:
-    name: Build with MSVC and Ninja
-    runs-on: windows-2022
-
-    env:
-      QT_VERSION: 6.4.2
-      QT_DIR: ${{ github.workspace }}\Qt
-
-    steps:
-    - name: 📦 Checkout source code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: ⚙️ Install Ninja build system
-      run: choco install ninja --no-progress
-
-    - name: 📥 Install Qt for MSVC
-      uses: jurplel/install-qt-action@v3
-      with:
-        version: ${{ env.QT_VERSION }}
-        target: desktop
-        host: windows
-        arch: win64_msvc2019_64
-        dir: ${{ env.QT_DIR }}
-        setup-python: false
-
-    - name: 🏗️ Setup MSVC Developer Environment
-      uses: TheMrMilchmann/setup-msvc-dev@v3
-      with:
-        arch: x64
-
-    - name: 🛠️ Configure CMake with Ninja + MSVC
-      run: |
-        cmake -S . -B build -G Ninja `
-          -DCMAKE_PREFIX_PATH="${{ env.QT_DIR }}\Qt\${{ env.QT_VERSION }}\msvc2019_64" `
-          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\install" `
-          -DCMAKE_BUILD_TYPE=Release
-      shell: powershell
-
-    - name: 🔨 Build with Ninja + MSVC
-      run: cmake --build build
-      shell: powershell
-
-    - name: 📦 Install built files
-      run: cmake --install build
-      shell: powershell
-
-  build_windows_mingw:
-    name: Build with Qt's MinGW and CMake (no Ninja)
-    runs-on: windows-2022
-
-    env:
-      QT_VERSION: 6.8.3
-      QT_DIR: ${{ github.workspace }}\Qt
-
-    steps:
-    - name: 📦 Checkout source code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: 📥 Install Qt + MinGW
-      uses: jurplel/install-qt-action@v4
-      with:
-        aqtversion: '==3.1.19'
-        version: ${{ env.QT_VERSION }}
-        target: desktop
-        host: windows
-        arch: win64_mingw
-        dir: ${{ env.QT_DIR }}
-        tools: 'tools_mingw1310'
-        setup-python: false
-
-    - name: ➕ Add Qt-bundled MinGW to PATH
-      shell: powershell
-      run: |  
-        echo "${{ env.QT_DIR }}\Tools\mingw1310_64\bin" >> $env:GITHUB_PATH
-
-    - name: 🛠️ Configure CMake (MinGW)
-      shell: powershell
-      run: |
-        cmake -S . -B build-mingw `
-          -DCMAKE_PREFIX_PATH="${{ env.QT_DIR }}\Qt\${{ env.QT_VERSION }}\mingw_64" `
-          -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\install `
-          -DCMAKE_BUILD_TYPE=Release `
-          -G "MinGW Makefiles"
-
-    - name: 🔨 Build with CMake (MinGW)
-      shell: powershell
-      run: cmake --build build-mingw -- -j2
-
-    - name: 📦 Install built files (MinGW)
-      shell: powershell
-      run: cmake --install build-mingw
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*.pro.user*
+*.pro.user
 /build
 *.o
 *.dylib
@@ -7,9 +7,6 @@ qrc_*
 moc_*
 ui_*
 Makefile
-*.dll
-*.a
-build*

 # IDEs
 .idea
@@ -386,4 +383,3 @@ FodyWeavers.xsd
 / build
 /Settings.ini
 .vscode/settings.json
-/.settings
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<configuration id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795" name="Default">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
+			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-1242828358748104657" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+		</extension>
+	</configuration>
+</project>
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,253 @@
+language: cpp
+# gcc is clang on mac
+compiler: gcc
+
+matrix:
+  fast_finish: true
+  include:
+  - name: Ubuntu qmake Qt5.5.1
+    os: linux
+    dist: trusty
+    group: stable
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt551-trusty'
+        update: true
+        packages:
+        - qt55base
+        - qt55tools
+        - qt55x11extras
+        - libqt5x11extras5-dev
+        - gcc-9
+        - g++-9
+    script:
+        - PATH="/opt/qt55/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt55-env.sh
+        - qmake
+        - make
+        - make install
+  - name: Ubuntu qmake dll
+    os: linux
+    dist: bionic
+    group: stable
+    services:
+        - xvfb
+    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
+        update: true
+        packages:
+        - qt514base
+        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
+        - gcc-9
+        - g++-9
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
+        - qmake
+        - make
+        - make install
+  - name: Ubuntu qmake static
+    os: linux
+    dist: bionic
+    group: stable
+    services:
+        - xvfb
+    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev  
+    addons:  
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
+        update: true
+        packages:
+        - qt514base
+        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
+        - gcc-9
+        - g++-9
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
+        - qmake "CONFIG+=adsBuildStatic"
+        - make
+        - make install
+  - name: Ubuntu CMake dll
+    os: linux
+    dist: bionic
+    group: stable
+    services:
+        - xvfb
+    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
+        update: true
+        packages:
+        - qt514base
+        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
+        - gcc-9
+        - g++-9
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
+        - mkdir ./build
+        - cd ./build
+        - cmake --version
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_STATIC=OFF -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_STATIC=OFF -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+  - name: Ubuntu CMake Static
+    os: linux
+    dist: bionic
+    group: stable
+    services:
+        - xvfb
+    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
+        update: true
+        packages:
+        - qt514base
+        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
+        - gcc-9
+        - g++-9
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
+        - mkdir ./build
+        - cd ./build
+        - cmake --version
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_STATIC=ON -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_STATIC=ON -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+  - name: macOS CMake dll
+    os: osx
+    osx_image: xcode11.3
+    compiler: clang
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - mkdir -p build
+        - cd build
+        - cmake --version
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+  - name: macOS CMake static
+    os: osx
+    osx_image: xcode11.3
+    compiler: clang
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - mkdir -p build
+        - cd build
+        - cmake --version
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+  - name: macOS qmake dll
+    os: osx
+    osx_image: xcode11.3
+    compiler: clang
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - qmake
+        - make
+        - make install
+  - name: macOS qmake static
+    os: osx
+    osx_image: xcode11.3
+    compiler: clang
+    addons:
+      homebrew:
+        packages:
+        - qt
+        update: true
+    script:
+        - PATH="/usr/local/opt/qt5/bin:$PATH"
+        - qmake "CONFIG+=adsBuildStatic"
+        - make
+        - make install
+notifications:
+  email: false
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,47 +1,20 @@
-cmake_minimum_required(VERSION 3.16)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-if (POLICY CMP0091)
-  cmake_policy(SET CMP0091 NEW)
-endif (POLICY CMP0091)
-
-# By default, the version information is extracted from the git index. However,
-# we can override this behavior by explicitly setting ADS_VERSION and
-# skipping the git checks. This is useful for cases where this project is being
-# used independently of its original git repo (e.g. vendored in another project)
-if(NOT ADS_VERSION)
-    set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-    include(GetGitRevisionDescription)
-    git_describe(GitTagVersion --tags)
-    string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}")
-    string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}")
-    string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}")
-    set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-    set(VERSION_SONAME "${VERSION_MAJOR}")
-else()
-    string(REGEX MATCHALL "[\.]" VERSION_DOT_MATCHES ${ADS_VERSION})
-    list(LENGTH VERSION_DOT_MATCHES VERSION_DOT_COUNT)
-    if(VERSION_DOT_COUNT EQUAL 2)
-        set(VERSION_SHORT ${ADS_VERSION})
-        string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_SONAME "${ADS_VERSION}")
-    else()
-        message(FATAL_ERROR "ADS_VERSION must be in major.minor.patch format, e.g. 3.8.1. Got ${ADS_VERSION}")
-    endif()
-endif()
-
-
+cmake_minimum_required(VERSION 3.5)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+include(GetGitRevisionDescription)
+git_describe(GitTagVersion --tags)
+string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}")
+string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}")
+string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}")
+set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT})
-
 option(BUILD_STATIC "Build the static library" OFF)
 option(BUILD_EXAMPLES "Build the examples" ON)
-
 if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
    set(ads_PlatformDir "x86")
 else()
    set(ads_PlatformDir "x64")
 endif()
-
 add_subdirectory(src)
-
 if(BUILD_EXAMPLES)
    add_subdirectory(examples)
    add_subdirectory(demo)
--- a/PyQtAds/QtAds/init.py
+++ b/PyQtAds/QtAds/init.py
@@ -0,0 +1,10 @@
+from .ads import ads
+from .._version import *
+
+import inspect
+
+for name, member in inspect.getmembers(ads):
+    if not name.startswith('_'):
+        globals()[name] = member
+        
+del ads
--- a/PyQtAds/init.py
+++ b/PyQtAds/init.py
@@ -0,0 +1,9 @@
+from .rc import *
+from ._version import get_versions
+__version__ = get_versions()['version']
+short_version = __version__
+version = __version__
+full_version = __version__
+git_revision = get_versions()['full-revisionid']
+release = not get_versions()['dirty']
+del get_versions
--- a/PyQtAds/_version.py
+++ b/PyQtAds/_version.py
@@ -0,0 +1,520 @@
+
+# This file helps to compute a version number in source trees obtained from
+# git-archive tarball (such as those provided by githubs download-from-tag
+# feature). Distribution tarballs (built by setup.py sdist) and build
+# directories (produced by setup.py build) will contain a much shorter file
+# that just contains the computed version number.
+
+# This file is released into the public domain. Generated by
+# versioneer-0.18 (https://github.com/warner/python-versioneer)
+
+"""Git implementation of _version.py."""
+
+import errno
+import os
+import re
+import subprocess
+import sys
+
+
+def get_keywords():
+    """Get the keywords needed to look up the version information."""
+    # these strings will be replaced by git during git-archive.
+    # setup.py/versioneer.py will grep for the variable names, so they must
+    # each be defined on a line of their own. _version.py will just call
+    # get_keywords().
+    git_refnames = "$Format:%d$"
+    git_full = "$Format:%H$"
+    git_date = "$Format:%ci$"
+    keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
+    return keywords
+
+
+class VersioneerConfig:
+    """Container for Versioneer configuration parameters."""
+
+
+def get_config():
+    """Create, populate and return the VersioneerConfig() object."""
+    # these strings are filled in when 'setup.py versioneer' creates
+    # _version.py
+    cfg = VersioneerConfig()
+    cfg.VCS = "git"
+    cfg.style = "pep440"
+    cfg.tag_prefix = ""
+    cfg.parentdir_prefix = "None"
+    cfg.versionfile_source = "PyQtAds/_version.py"
+    cfg.verbose = False
+    return cfg
+
+
+class NotThisMethod(Exception):
+    """Exception raised if a method is not valid for the current scenario."""
+
+
+LONG_VERSION_PY = {}
+HANDLERS = {}
+
+
+def register_vcs_handler(vcs, method):  # decorator
+    """Create decorator to mark a method as the handler of a VCS."""
+    def decorate(f):
+        """Store f in HANDLERS[vcs][method]."""
+        if vcs not in HANDLERS:
+            HANDLERS[vcs] = {}
+        HANDLERS[vcs][method] = f
+        return f
+    return decorate
+
+
+def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
+                env=None):
+    """Call the given command(s)."""
+    assert isinstance(commands, list)
+    p = None
+    for c in commands:
+        try:
+            dispcmd = str([c] + args)
+            # remember shell=False, so use git.cmd on windows, not just git
+            p = subprocess.Popen([c] + args, cwd=cwd, env=env,
+                                 stdout=subprocess.PIPE,
+                                 stderr=(subprocess.PIPE if hide_stderr
+                                         else None))
+            break
+        except EnvironmentError:
+            e = sys.exc_info()[1]
+            if e.errno == errno.ENOENT:
+                continue
+            if verbose:
+                print("unable to run %s" % dispcmd)
+                print(e)
+            return None, None
+    else:
+        if verbose:
+            print("unable to find command, tried %s" % (commands,))
+        return None, None
+    stdout = p.communicate()[0].strip()
+    if sys.version_info[0] >= 3:
+        stdout = stdout.decode()
+    if p.returncode != 0:
+        if verbose:
+            print("unable to run %s (error)" % dispcmd)
+            print("stdout was %s" % stdout)
+        return None, p.returncode
+    return stdout, p.returncode
+
+
+def versions_from_parentdir(parentdir_prefix, root, verbose):
+    """Try to determine the version from the parent directory name.
+
+    Source tarballs conventionally unpack into a directory that includes both
+    the project name and a version string. We will also support searching up
+    two directory levels for an appropriately named parent directory
+    """
+    rootdirs = []
+
+    for i in range(3):
+        dirname = os.path.basename(root)
+        if dirname.startswith(parentdir_prefix):
+            return {"version": dirname[len(parentdir_prefix):],
+                    "full-revisionid": None,
+                    "dirty": False, "error": None, "date": None}
+        else:
+            rootdirs.append(root)
+            root = os.path.dirname(root)  # up a level
+
+    if verbose:
+        print("Tried directories %s but none started with prefix %s" %
+              (str(rootdirs), parentdir_prefix))
+    raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
+
+
+@register_vcs_handler("git", "get_keywords")
+def git_get_keywords(versionfile_abs):
+    """Extract version information from the given file."""
+    # the code embedded in _version.py can just fetch the value of these
+    # keywords. When used from setup.py, we don't want to import _version.py,
+    # so we do it with a regexp instead. This function is not used from
+    # _version.py.
+    keywords = {}
+    try:
+        f = open(versionfile_abs, "r")
+        for line in f.readlines():
+            if line.strip().startswith("git_refnames ="):
+                mo = re.search(r'=\s*"(.*)"', line)
+                if mo:
+                    keywords["refnames"] = mo.group(1)
+            if line.strip().startswith("git_full ="):
+                mo = re.search(r'=\s*"(.*)"', line)
+                if mo:
+                    keywords["full"] = mo.group(1)
+            if line.strip().startswith("git_date ="):
+                mo = re.search(r'=\s*"(.*)"', line)
+                if mo:
+                    keywords["date"] = mo.group(1)
+        f.close()
+    except EnvironmentError:
+        pass
+    return keywords
+
+
+@register_vcs_handler("git", "keywords")
+def git_versions_from_keywords(keywords, tag_prefix, verbose):
+    """Get version information from git keywords."""
+    if not keywords:
+        raise NotThisMethod("no keywords at all, weird")
+    date = keywords.get("date")
+    if date is not None:
+        # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant
+        # datestamp. However we prefer "%ci" (which expands to an "ISO-8601
+        # -like" string, which we must then edit to make compliant), because
+        # it's been around since git-1.5.3, and it's too difficult to
+        # discover which version we're using, or to work around using an
+        # older one.
+        date = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
+    refnames = keywords["refnames"].strip()
+    if refnames.startswith("$Format"):
+        if verbose:
+            print("keywords are unexpanded, not using")
+        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
+    refs = set([r.strip() for r in refnames.strip("()").split(",")])
+    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
+    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
+    TAG = "tag: "
+    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
+    if not tags:
+        # Either we're using git < 1.8.3, or there really are no tags. We use
+        # a heuristic: assume all version tags have a digit. The old git %d
+        # expansion behaves like git log --decorate=short and strips out the
+        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
+        # between branches and tags. By ignoring refnames without digits, we
+        # filter out many common branch names like "release" and
+        # "stabilization", as well as "HEAD" and "master".
+        tags = set([r for r in refs if re.search(r'\d', r)])
+        if verbose:
+            print("discarding '%s', no digits" % ",".join(refs - tags))
+    if verbose:
+        print("likely tags: %s" % ",".join(sorted(tags)))
+    for ref in sorted(tags):
+        # sorting will prefer e.g. "2.0" over "2.0rc1"
+        if ref.startswith(tag_prefix):
+            r = ref[len(tag_prefix):]
+            if verbose:
+                print("picking %s" % r)
+            return {"version": r,
+                    "full-revisionid": keywords["full"].strip(),
+                    "dirty": False, "error": None,
+                    "date": date}
+    # no suitable tags, so version is "0+unknown", but full hex is still there
+    if verbose:
+        print("no suitable tags, using unknown + full revision id")
+    return {"version": "0+unknown",
+            "full-revisionid": keywords["full"].strip(),
+            "dirty": False, "error": "no suitable tags", "date": None}
+
+
+@register_vcs_handler("git", "pieces_from_vcs")
+def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
+    """Get version from 'git describe' in the root of the source tree.
+
+    This only gets called if the git-archive 'subst' keywords were *not*
+    expanded, and _version.py hasn't already been rewritten with a short
+    version string, meaning we're inside a checked out source tree.
+    """
+    GITS = ["git"]
+    if sys.platform == "win32":
+        GITS = ["git.cmd", "git.exe"]
+
+    out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root,
+                          hide_stderr=True)
+    if rc != 0:
+        if verbose:
+            print("Directory %s not under git control" % root)
+        raise NotThisMethod("'git rev-parse --git-dir' returned error")
+
+    # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
+    # if there isn't one, this yields HEX[-dirty] (no NUM)
+    describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
+                                          "--always", "--long",
+                                          "--match", "%s*" % tag_prefix],
+                                   cwd=root)
+    # --long was added in git-1.5.5
+    if describe_out is None:
+        raise NotThisMethod("'git describe' failed")
+    describe_out = describe_out.strip()
+    full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
+    if full_out is None:
+        raise NotThisMethod("'git rev-parse' failed")
+    full_out = full_out.strip()
+
+    pieces = {}
+    pieces["long"] = full_out
+    pieces["short"] = full_out[:7]  # maybe improved later
+    pieces["error"] = None
+
+    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
+    # TAG might have hyphens.
+    git_describe = describe_out
+
+    # look for -dirty suffix
+    dirty = git_describe.endswith("-dirty")
+    pieces["dirty"] = dirty
+    if dirty:
+        git_describe = git_describe[:git_describe.rindex("-dirty")]
+
+    # now we have TAG-NUM-gHEX or HEX
+
+    if "-" in git_describe:
+        # TAG-NUM-gHEX
+        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
+        if not mo:
+            # unparseable. Maybe git-describe is misbehaving?
+            pieces["error"] = ("unable to parse git-describe output: '%s'"
+                               % describe_out)
+            return pieces
+
+        # tag
+        full_tag = mo.group(1)
+        if not full_tag.startswith(tag_prefix):
+            if verbose:
+                fmt = "tag '%s' doesn't start with prefix '%s'"
+                print(fmt % (full_tag, tag_prefix))
+            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
+                               % (full_tag, tag_prefix))
+            return pieces
+        pieces["closest-tag"] = full_tag[len(tag_prefix):]
+
+        # distance: number of commits since tag
+        pieces["distance"] = int(mo.group(2))
+
+        # commit: short hex revision ID
+        pieces["short"] = mo.group(3)
+
+    else:
+        # HEX: no tags
+        pieces["closest-tag"] = None
+        count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"],
+                                    cwd=root)
+        pieces["distance"] = int(count_out)  # total number of commits
+
+    # commit date: see ISO-8601 comment in git_versions_from_keywords()
+    date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"],
+                       cwd=root)[0].strip()
+    pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
+
+    return pieces
+
+
+def plus_or_dot(pieces):
+    """Return a + if we don't already have one, else return a ."""
+    if "+" in pieces.get("closest-tag", ""):
+        return "."
+    return "+"
+
+
+def render_pep440(pieces):
+    """Build up version string, with post-release "local version identifier".
+
+    Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
+    get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
+
+    Exceptions:
+    1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"] or pieces["dirty"]:
+            rendered += plus_or_dot(pieces)
+            rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
+            if pieces["dirty"]:
+                rendered += ".dirty"
+    else:
+        # exception #1
+        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
+                                          pieces["short"])
+        if pieces["dirty"]:
+            rendered += ".dirty"
+    return rendered
+
+
+def render_pep440_pre(pieces):
+    """TAG[.post.devDISTANCE] -- No -dirty.
+
+    Exceptions:
+    1: no tags. 0.post.devDISTANCE
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"]:
+            rendered += ".post.dev%d" % pieces["distance"]
+    else:
+        # exception #1
+        rendered = "0.post.dev%d" % pieces["distance"]
+    return rendered
+
+
+def render_pep440_post(pieces):
+    """TAG[.postDISTANCE[.dev0]+gHEX] .
+
+    The ".dev0" means dirty. Note that .dev0 sorts backwards
+    (a dirty tree will appear "older" than the corresponding clean one),
+    but you shouldn't be releasing software with -dirty anyways.
+
+    Exceptions:
+    1: no tags. 0.postDISTANCE[.dev0]
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"] or pieces["dirty"]:
+            rendered += ".post%d" % pieces["distance"]
+            if pieces["dirty"]:
+                rendered += ".dev0"
+            rendered += plus_or_dot(pieces)
+            rendered += "g%s" % pieces["short"]
+    else:
+        # exception #1
+        rendered = "0.post%d" % pieces["distance"]
+        if pieces["dirty"]:
+            rendered += ".dev0"
+        rendered += "+g%s" % pieces["short"]
+    return rendered
+
+
+def render_pep440_old(pieces):
+    """TAG[.postDISTANCE[.dev0]] .
+
+    The ".dev0" means dirty.
+
+    Exceptions:
+    1: no tags. 0.postDISTANCE[.dev0]
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"] or pieces["dirty"]:
+            rendered += ".post%d" % pieces["distance"]
+            if pieces["dirty"]:
+                rendered += ".dev0"
+    else:
+        # exception #1
+        rendered = "0.post%d" % pieces["distance"]
+        if pieces["dirty"]:
+            rendered += ".dev0"
+    return rendered
+
+
+def render_git_describe(pieces):
+    """TAG[-DISTANCE-gHEX][-dirty].
+
+    Like 'git describe --tags --dirty --always'.
+
+    Exceptions:
+    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        if pieces["distance"]:
+            rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
+    else:
+        # exception #1
+        rendered = pieces["short"]
+    if pieces["dirty"]:
+        rendered += "-dirty"
+    return rendered
+
+
+def render_git_describe_long(pieces):
+    """TAG-DISTANCE-gHEX[-dirty].
+
+    Like 'git describe --tags --dirty --always -long'.
+    The distance/hash is unconditional.
+
+    Exceptions:
+    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
+    """
+    if pieces["closest-tag"]:
+        rendered = pieces["closest-tag"]
+        rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
+    else:
+        # exception #1
+        rendered = pieces["short"]
+    if pieces["dirty"]:
+        rendered += "-dirty"
+    return rendered
+
+
+def render(pieces, style):
+    """Render the given version pieces into the requested style."""
+    if pieces["error"]:
+        return {"version": "unknown",
+                "full-revisionid": pieces.get("long"),
+                "dirty": None,
+                "error": pieces["error"],
+                "date": None}
+
+    if not style or style == "default":
+        style = "pep440"  # the default
+
+    if style == "pep440":
+        rendered = render_pep440(pieces)
+    elif style == "pep440-pre":
+        rendered = render_pep440_pre(pieces)
+    elif style == "pep440-post":
+        rendered = render_pep440_post(pieces)
+    elif style == "pep440-old":
+        rendered = render_pep440_old(pieces)
+    elif style == "git-describe":
+        rendered = render_git_describe(pieces)
+    elif style == "git-describe-long":
+        rendered = render_git_describe_long(pieces)
+    else:
+        raise ValueError("unknown style '%s'" % style)
+
+    return {"version": rendered, "full-revisionid": pieces["long"],
+            "dirty": pieces["dirty"], "error": None,
+            "date": pieces.get("date")}
+
+
+def get_versions():
+    """Get version information or return default if unable to do so."""
+    # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
+    # __file__, we can work backwards from there to the root. Some
+    # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
+    # case we can only use expanded keywords.
+
+    cfg = get_config()
+    verbose = cfg.verbose
+
+    try:
+        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
+                                          verbose)
+    except NotThisMethod:
+        pass
+
+    try:
+        root = os.path.realpath(__file__)
+        # versionfile_source is the relative path from the top of the source
+        # tree (where the .git directory might live) to this file. Invert
+        # this to find the root from __file__.
+        for i in cfg.versionfile_source.split('/'):
+            root = os.path.dirname(root)
+    except NameError:
+        return {"version": "0+unknown", "full-revisionid": None,
+                "dirty": None,
+                "error": "unable to find root of source tree",
+                "date": None}
+
+    try:
+        pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
+        return render(pieces, cfg.style)
+    except NotThisMethod:
+        pass
+
+    try:
+        if cfg.parentdir_prefix:
+            return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
+    except NotThisMethod:
+        pass
+
+    return {"version": "0+unknown", "full-revisionid": None,
+            "dirty": None,
+            "error": "unable to compute version", "date": None}
--- a/README.md
+++ b/README.md
--- a/ads.pri
+++ b/ads.pri
@@ -1,28 +1,28 @@

-CONFIG(debug, debug|release){
-    win32-g++ {
-    	versionAtLeast(QT_VERSION, 5.15.0) {
-    		LIBS += -lqtadvanceddocking
-    	}
-    	else {
-    		LIBS += -lqtadvanceddockingd
-    	}
+lessThan(QT_MAJOR_VERSION, 6) {
+    CONFIG(debug, debug|release){
+        win32 {
+            LIBS += -lqtadvanceddockingd
+        }
+        else:mac {
+            LIBS += -lqtadvanceddocking_debug
+        }
+        else {
+            LIBS += -lqtadvanceddocking
+        }
    }
-    else:msvc {
-        LIBS += -lqtadvanceddockingd
-    }
-    else:mac {
-        LIBS += -lqtadvanceddocking_debug
-    }
-    else {
+    else{
        LIBS += -lqtadvanceddocking
    }
 }
-else{
+else {
+    # qt$$qtLibraryTarget(qtadvanceddocking) does not produce an advanceddockingd.dll file on Windows
+    # for Qt6 - I don't know if this is a bug and I have to investigate
    LIBS += -lqtadvanceddocking
 }


 unix:!macx {
    LIBS += -lxcb
+    QT += x11extras
 }
--- a/adsConfig.cmake
+++ b/adsConfig.cmake
@@ -2,4 +2,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
+if(UNIX AND NOT APPLE)
+    find_dependency(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED)
+endif()
 include("${CMAKE_CURRENT_LIST_DIR}/adsTargets.cmake")
--- a/cmake/modules/FileVersionInfo.rc.in
+++ b/cmake/modules/FileVersionInfo.rc.in
@@ -1,29 +0,0 @@
-#include <windows.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION     @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
- PRODUCTVERSION  @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
- FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
- FILEFLAGS       0
- FILEOS          VOS__WINDOWS32
- FILETYPE        VFT_APP
- FILESUBTYPE     0
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",      "My Company\0"
-            VALUE "FileDescription",  "@PROJECT_NAME@\0"
-            VALUE "FileVersion",      "@PROJECT_VERSION_STRING@\0"
-            VALUE "ProductVersion",   "@PROJECT_VERSION_STRING@\0"
-            VALUE "GitCommitFull",    "@PROJECT_GIT_HASH@\0"
-            VALUE "GitCommitShort",   "@PROJECT_GIT_HASH_SHORT@\0"
-        END
-    END
-
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 1200
-    END
-END
--- a/cmake/modules/Versioning.cmake
+++ b/cmake/modules/Versioning.cmake
@@ -1,95 +0,0 @@
-# ============================================================
-# Versioning.cmake  (Reusable Version + Resource Generator)
-# ============================================================
-
-# Freeze the directory where this module lives
-# This is critical — it prevents paths from breaking when the
-# function is invoked from other CMakeLists.txt files.
-set(_VERSIONING_MODULE_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "Versioning module directory")
-
-# ------------------------------------------------------------
-# Extract version information from Git
-# ------------------------------------------------------------
-
-# Get tag (expected: v1.2.3 or 1.2.3 or 1.2.3-12-gHASH)
-execute_process(
-    COMMAND git describe --tags --dirty
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_DESC_RAW
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-# Remove leading "v" if present
-string(REGEX REPLACE "^v" "" GIT_DESC "${GIT_DESC_RAW}")
-
-# Extract major.minor.patch
-string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _ "${GIT_DESC}")
-set(PROJECT_VERSION_MAJOR "${CMAKE_MATCH_1}")
-set(PROJECT_VERSION_MINOR "${CMAKE_MATCH_2}")
-set(PROJECT_VERSION_PATCH "${CMAKE_MATCH_3}")
-
-set(PROJECT_VERSION_STRING
-    "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
-)
-
-# Commit hash (full + short)
-execute_process(
-    COMMAND git rev-parse HEAD
-    OUTPUT_VARIABLE PROJECT_GIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-execute_process(
-    COMMAND git rev-parse --short HEAD
-    OUTPUT_VARIABLE PROJECT_GIT_HASH_SHORT
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-# Export variables to parent scope
-set(PROJECT_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}" PARENT_SCOPE)
-set(PROJECT_VERSION_MINOR "${PROJECT_VERSION_MINOR}" PARENT_SCOPE)
-set(PROJECT_VERSION_PATCH "${PROJECT_VERSION_PATCH}" PARENT_SCOPE)
-set(PROJECT_VERSION_STRING "${PROJECT_VERSION_STRING}" PARENT_SCOPE)
-set(PROJECT_GIT_HASH "${PROJECT_GIT_HASH}" PARENT_SCOPE)
-set(PROJECT_GIT_HASH_SHORT "${PROJECT_GIT_HASH_SHORT}" PARENT_SCOPE)
-
-# Public variable for users
-set(PROJECT_AUTO_VERSION "${PROJECT_VERSION_STRING}" PARENT_SCOPE)
-
-# ------------------------------------------------------------
-# Reusable function: Attach Windows version resources to target
-# ------------------------------------------------------------
-function(add_windows_version_resources target)
-    if(NOT WIN32)
-        return()
-    endif()
-
-    if(NOT TARGET "${target}")
-        message(FATAL_ERROR "add_windows_version_resources: target '${target}' not found.")
-    endif()
-
-    # Absolute path to the template (never changes)
-    get_filename_component(_rc_in
-        "${_VERSIONING_MODULE_DIR}/FileVersionInfo.rc.in"
-        ABSOLUTE
-    )
-
-    if(NOT EXISTS "${_rc_in}")
-        message(FATAL_ERROR
-            "FileVersionInfo.rc.in missing at: ${_rc_in}"
-        )
-    endif()
-
-    # Output in the caller's binary dir
-    set(_rc_out "${CMAKE_CURRENT_BINARY_DIR}/${target}_version.rc")
-    get_filename_component(_rc_out "${_rc_out}" ABSOLUTE)
-
-    # Ensure directory exists
-    file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-    # Configure the template
-    configure_file("${_rc_in}" "${_rc_out}" @ONLY)
-
-    # Add to the target
-    target_sources(${target} PRIVATE "${_rc_out}")
-endfunction()
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@@ -1,10 +1,9 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 project(ads_demo VERSION ${VERSION_SHORT}) 

-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets Quick QuickWidgets REQUIRED)
-if(WIN32 AND QT_VERSION_MAJOR LESS 6)
-    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AxContainer REQUIRED)
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+if(WIN32)
+    find_package(Qt5 5.5 COMPONENTS AxContainer REQUIRED)
 endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(ads_demo_SRCS
@@ -13,21 +12,15 @@ set(ads_demo_SRCS
    mainwindow.ui
    StatusDialog.cpp
    StatusDialog.ui
-    ImageViewer.cpp
-    RenderWidget.cpp
 	demo.qrc
 )
 add_executable(AdvancedDockingSystemDemo WIN32 ${ads_demo_SRCS})
 target_include_directories(AdvancedDockingSystemDemo PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src")
-target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::Core 
-                                                       Qt${QT_VERSION_MAJOR}::Gui 
-                                                       Qt${QT_VERSION_MAJOR}::Widgets
-                                                       Qt${QT_VERSION_MAJOR}::Quick
-                                                       Qt${QT_VERSION_MAJOR}::QuickWidgets)
-if(WIN32 AND QT_VERSION_MAJOR LESS 6)
-    target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::AxContainer)
+target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+if(WIN32)
+    target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt5::AxContainer)
 endif()
-target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking-qt${QT_VERSION_MAJOR})
+target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking)
 set_target_properties(AdvancedDockingSystemDemo PROPERTIES 
    AUTOMOC ON
    AUTORCC ON
--- a/demo/ImageViewer.cpp
+++ b/demo/ImageViewer.cpp
@@ -1,280 +0,0 @@
-//============================================================================
-/// \file   ImageViewer.cpp
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Implementation of CImageViewer
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include "ImageViewer.h"
-
-#include <math.h>
-
-#include <QLabel>
-#include <QImageReader>
-#include <QImageWriter>
-#include <QMessageBox>
-#include <QApplication>
-#include <QDir>
-#include <QFileDialog>
-#include <QStandardPaths>
-#include <QAction>
-#include <QScrollBar>
-#include <QPixmap>
-#include <QPainter>
-#include <QImage>
-#include <QMouseEvent>
-#include <QWheelEvent>
-
-#include "RenderWidget.h"
-
-/**
- * Private image viewer data
- */
-struct ImageViewerPrivate
-{
-	CImageViewer* _this;
-	CRenderWidget* RenderWidget;///< renders the image to screen
-	bool AutoFit;///< automatically fit image to window size on resize events
-	QSize ImageSize;///< stores the image size to detect image size changes
-	QPoint MouseMoveStartPos;///< for calculation of mouse move vector
-	QLabel* ScalingLabel;///< label displays scaling factor
-	QList<QWidget*> OverlayTools;///< list of tool widget to overlay
-
-	ImageViewerPrivate(CImageViewer* _public) : _this(_public) {}
-};
-
-
-
-//============================================================================
-CImageViewer::CImageViewer(QWidget *parent)
-	: Super(parent),
-	  d(new ImageViewerPrivate(this))
-{
-	d->AutoFit = true;
-	d->RenderWidget = new CRenderWidget(this);
-
-	this->setBackgroundRole(QPalette::Light);
-	this->setAlignment(Qt::AlignCenter);
-	this->setWidget(d->RenderWidget);
-	this->createActions();
-	this->setMouseTracking(false); // only produce mouse move events if mouse button pressed
-}
-
-
-//============================================================================
-CImageViewer::~CImageViewer()
-{
-	delete d;
-}
-
-
-//============================================================================
-bool CImageViewer::loadFile(const QString& fileName)
-{
-    QImageReader reader(fileName);
-    reader.setAutoTransform(true);
-    const QImage newImage = reader.read();
-    if (newImage.isNull())
-    {
-        QMessageBox::information(this, QGuiApplication::applicationDisplayName(),
-                                 tr("Cannot load %1: %2")
-                                 .arg(QDir::toNativeSeparators(fileName), reader.errorString()));
-        return false;
-    }
-
-    setImage(newImage);
-    setWindowFilePath(fileName);
-    return true;
-}
-
-
-//===========================================================================
-void CImageViewer::setImage(const QImage &newImage)
-{
-    d->RenderWidget->showImage(newImage);
-    this->adjustDisplaySize(newImage);
-}
-
-
-//============================================================================
-void CImageViewer::adjustDisplaySize(const QImage& Image)
-{
-	if (d->ImageSize == Image.size())
-	{
-		return;
-	}
-	d->ImageSize = Image.size();
-	if (d->AutoFit)
-	{
-		this->fitToWindow();
-	}
-}
-
-
-//===========================================================================
-static void initializeImageFileDialog(QFileDialog &dialog, QFileDialog::AcceptMode acceptMode)
-{
-    static bool firstDialog = true;
-
-    if (firstDialog) {
-        firstDialog = false;
-        const QStringList picturesLocations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
-        dialog.setDirectory(picturesLocations.isEmpty() ? QDir::currentPath() : picturesLocations.last());
-    }
-
-    QStringList mimeTypeFilters;
-    const QByteArrayList supportedMimeTypes = acceptMode == QFileDialog::AcceptOpen
-        ? QImageReader::supportedMimeTypes() : QImageWriter::supportedMimeTypes();
-    for (const QByteArray &mimeTypeName : supportedMimeTypes)
-        mimeTypeFilters.append(mimeTypeName);
-    mimeTypeFilters.sort();
-    dialog.setMimeTypeFilters(mimeTypeFilters);
-    dialog.selectMimeTypeFilter("image/jpeg");
-    if (acceptMode == QFileDialog::AcceptSave)
-        dialog.setDefaultSuffix("jpg");
-}
-
-
-//===========================================================================
-void CImageViewer::open()
-{
-    QFileDialog dialog(this, tr("Open File"));
-    initializeImageFileDialog(dialog, QFileDialog::AcceptOpen);
-
-    while (dialog.exec() == QDialog::Accepted && !loadFile(dialog.selectedFiles().first())) {}
-}
-
-
-//===========================================================================
-void CImageViewer::createActions()
-{
-	QAction* a;
-    a = new QAction(tr("&Open..."));
-    a->setIcon(QIcon(":/adsdemo/images/perm_media.svg"));
-    connect(a, &QAction::triggered, this, &CImageViewer::open);
-    a->setShortcut(QKeySequence::Open);;
-    this->addAction(a);
-
-	a = new QAction(tr("Fit on Screen"));
-	a->setIcon(QIcon(":/adsdemo/images/zoom_out_map.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::fitToWindow);
-	this->addAction(a);
-
-	a = new QAction(tr("Actual Pixels"));
-	a->setIcon(QIcon(":/adsdemo/images/find_in_page.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::normalSize);
-	this->addAction(a);
-
-	a = new QAction(this);
-	a->setSeparator(true);
-	this->addAction(a);
-
-	a = new QAction(tr("Zoom In (25%)"));
-	a->setIcon(QIcon(":/adsdemo/images/zoom_in.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::zoomIn);
-	this->addAction(a);
-
-	a = new QAction(tr("Zoom Out (25%)"));
-	a->setIcon(QIcon(":/adsdemo/images/zoom_out.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::zoomOut);
-	this->addAction(a);
-
-	this->setContextMenuPolicy(Qt::ActionsContextMenu);
-}
-
-
-//===========================================================================
-void CImageViewer::zoomIn()
-{
-	d->AutoFit = false;
-	d->RenderWidget->zoomIn();
-}
-
-
-//===========================================================================
-void CImageViewer::zoomOut()
-{
-	d->AutoFit = false;
-	d->RenderWidget->zoomOut();
-}
-
-
-//===========================================================================
-void CImageViewer::normalSize()
-{
-	d->AutoFit = false;
-	d->RenderWidget->normalSize();
-}
-
-
-//===========================================================================
-void CImageViewer::fitToWindow()
-{
-	d->AutoFit = true;
-	d->RenderWidget->scaleToSize(this->maximumViewportSize());
-}
-
-
-//============================================================================
-void CImageViewer::resizeEvent(QResizeEvent* ResizeEvent)
-{
-	Super::resizeEvent(ResizeEvent);
-	if (d->AutoFit)
-	{
-		this->fitToWindow();
-	}
-}
-
-
-//============================================================================
-void CImageViewer::mousePressEvent(QMouseEvent* Event)
-{
-	d->RenderWidget->setCursor(Qt::ClosedHandCursor);
-	d->MouseMoveStartPos = Event->pos();
-	Super::mousePressEvent(Event);
-}
-
-
-//============================================================================
-void CImageViewer::mouseReleaseEvent(QMouseEvent* Event)
-{
-	d->RenderWidget->setCursor(Qt::OpenHandCursor);
-	Super::mouseReleaseEvent(Event);
-}
-
-
-//============================================================================
-void CImageViewer::mouseMoveEvent(QMouseEvent* Event)
-{
-	QPoint MoveVector = Event->pos() - d->MouseMoveStartPos;
-	d->MouseMoveStartPos = Event->pos();
-	horizontalScrollBar()->setValue(horizontalScrollBar()->value()
-	    - MoveVector.x());
-	verticalScrollBar()->setValue(verticalScrollBar()->value() - MoveVector.y());
-}
-
-
-//============================================================================
-void CImageViewer::wheelEvent(QWheelEvent* Event)
-{
-	double numDegrees = Event->angleDelta().y() / 8;
-	double numSteps = numDegrees / 15;
-	d->AutoFit = false;
-	double Zoom;
-	if (numSteps < 0)
-	{
-		Zoom = pow(0.9, 0 - numSteps);
-	}
-	else
-	{
-		Zoom = pow(1.10, numSteps);
-	}
-	d->RenderWidget->zoomByValue(Zoom);
-}
-
-#include "moc_ImageViewer.cpp"
-//---------------------------------------------------------------------------
-// EOF ImageViewer.cpp
--- a/demo/ImageViewer.h
+++ b/demo/ImageViewer.h
@@ -1,88 +0,0 @@
-#ifndef ImageViewerH
-#define ImageViewerH
-//============================================================================
-/// \file   ImageViewer.h
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Declaration of CImageViewer
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <QScrollArea>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-QT_END_NAMESPACE
-
-
-struct ImageViewerPrivate;
-
-/**
- * Tiny simple image viewer for showing images in demo
- */
-class CImageViewer : public QScrollArea
-{
-	Q_OBJECT
-public:
-	using Super = QScrollArea;
-
-	explicit CImageViewer(QWidget *parent = nullptr);
-    virtual ~CImageViewer();
-
-	bool loadFile(const QString& Filename);
-	void setImage(const QImage &newImage);
-
-public Q_SLOTS:
-	void open();
-    void zoomIn();
-    void zoomOut();
-    void normalSize();
-    void fitToWindow();
-
-protected:
-	/**
-	 * @brief Reimplemented from QScrollArea to adjust image scaling if m_AutoFit is
-	 * true.
-	 */
-	virtual void resizeEvent(QResizeEvent* ResizeEvent);
-
-	/**
-	 * @brief Handle mouse press events.
-	 */
-	virtual void mousePressEvent(QMouseEvent* Event);
-
-	/**
-	 * @brief Handles mouse release events.
-	 */
-	virtual void mouseReleaseEvent(QMouseEvent* Event);
-
-	/**
-	 * @brief Handle mouse move events.
-	 */
-	virtual void mouseMoveEvent(QMouseEvent* Event);
-
-	/**
-	 * @brief Use mouse wheel to change scaling of the image.
-	 */
-	virtual void wheelEvent(QWheelEvent* Event);
-
-private:
-    /**
-	 * @brief Create the wiget actions.
-	 */
-    void createActions();
-
-	/**
-	 * @brief Adjust size of render widget in case of image size change.
-	 * @param[in] Image The new image that may have a different image size.
-	 */
-	void adjustDisplaySize(const QImage& Image);
-
-    ImageViewerPrivate* d;
-    friend ImageViewerPrivate;
-};
-
-//---------------------------------------------------------------------------
-#endif // ImageViewerH
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -60,45 +60,26 @@
 #include <QToolButton>
 #include <QToolBar>
 #include <QPointer>
-#include <QMap>
-#include <QElapsedTimer>
-#include <QQuickWidget>


-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#include <QRandomGenerator>
-#endif
-
 #ifdef Q_OS_WIN
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QAxWidget>
 #endif
 #endif

-#include "DockAreaTabBar.h"
-#include "DockAreaTitleBar.h"
-#include "DockAreaWidget.h"
-#include "DockComponentsFactory.h"
+#include <QMap>
+#include <QElapsedTimer>
+
 #include "DockManager.h"
-#include "DockSplitter.h"
 #include "DockWidget.h"
+#include "DockAreaWidget.h"
+#include "DockAreaTitleBar.h"
+#include "DockAreaTabBar.h"
 #include "FloatingDockContainer.h"
-#include "ImageViewer.h"
-#include "MyDockAreaTitleBar.h"
+#include "DockComponentsFactory.h"
 #include "StatusDialog.h"

-/**
- * Returns a random number from 0 to highest - 1
- */
-int randomNumberBounded(int highest)
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-	return QRandomGenerator::global()->bounded(highest);
-#else
-	qsrand(QTime::currentTime().msec());
-	return qrand() % highest;
-#endif
-}


 /**
@@ -146,7 +127,7 @@ public:
 	using Super = ads::CDockComponentsFactory;
 	ads::CDockAreaTitleBar* createDockAreaTitleBar(ads::CDockAreaWidget* DockArea) const override
 	{
-		auto TitleBar = new MyDockAreaTitleBar(DockArea);
+		auto TitleBar = new ads::CDockAreaTitleBar(DockArea);
 		auto CustomButton = new QToolButton(DockArea);
 		CustomButton->setToolTip(QObject::tr("Help"));
 		CustomButton->setIcon(svgIcon(":/adsdemo/images/help_outline.svg"));
@@ -235,11 +216,9 @@ struct MainWindowPrivate
 		QFileSystemModel* m = new QFileSystemModel(w);
 		m->setRootPath(QDir::currentPath());
 		w->setModel(m);
-		w->setRootIndex(m->index(QDir::currentPath()));
-		ads::CDockWidget* DockWidget = DockManager->createDockWidget(QString("Filesystem %1")
+		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Filesystem %1")
 			.arg(FileSystemCount++));
 		DockWidget->setWidget(w);
-		DockWidget->setIcon(svgIcon(":/adsdemo/images/folder_open.svg"));
 		ui.menuView->addAction(DockWidget->toggleViewAction());
 		// We disable focus to test focus highlighting if the dock widget content
 		// does not support focus
@@ -257,7 +236,7 @@ struct MainWindowPrivate
 	{
 		static int CalendarCount = 0;
 		QCalendarWidget* w = new QCalendarWidget();
-		ads::CDockWidget* DockWidget = DockManager->createDockWidget(QString("Calendar %1").arg(CalendarCount++));
+		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Calendar %1").arg(CalendarCount++));
 		// The following lines are for testing the setWidget() and takeWidget()
 		// functionality
 		DockWidget->setWidget(w);
@@ -270,10 +249,6 @@ struct MainWindowPrivate
 		auto ToolBar = DockWidget->createDefaultToolBar();
 		ToolBar->addAction(ui.actionSaveState);
 		ToolBar->addAction(ui.actionRestoreState);
-		// For testing all calendar dock widgets have a the tool button style
-		// Qt::ToolButtonTextUnderIcon
-		DockWidget->setToolBarStyleSource(ads::CDockWidget::ToolBarStyleFromDockWidget);
-		DockWidget->setToolBarStyle(Qt::ToolButtonTextUnderIcon, ads::CDockWidget::StateFloating);
 		return DockWidget;
 	}

@@ -302,9 +277,8 @@ struct MainWindowPrivate
 			.arg(LabelCount)
 			.arg(QTime::currentTime().toString("hh:mm:ss:zzz")));

-		ads::CDockWidget* DockWidget = DockManager->createDockWidget(QString("Label %1").arg(LabelCount++));
+		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Label %1").arg(LabelCount++));
 		DockWidget->setWidget(l);
-		DockWidget->setIcon(svgIcon(":/adsdemo/images/font_download.svg"));
 		ui.menuView->addAction(DockWidget->toggleViewAction());
 		return DockWidget;
 	}
@@ -320,7 +294,7 @@ struct MainWindowPrivate
 		w->setPlaceholderText("This is an editor. If you close the editor, it will be "
 			"deleted. Enter your text here.");
 		w->setStyleSheet("border: none");
-		ads::CDockWidget* DockWidget = DockManager->createDockWidget(QString("Editor %1").arg(EditorCount++));
+		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Editor %1").arg(EditorCount++));
 		DockWidget->setWidget(w);
 		DockWidget->setIcon(svgIcon(":/adsdemo/images/edit.svg"));
 		DockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
@@ -342,35 +316,6 @@ struct MainWindowPrivate
 		return DockWidget;
 	}

-	/**
-	 * Creates a simply image viewr
-	 */
-	ads::CDockWidget* createImageViewer()
-	{
-		static int ImageViewerCount = 0;
-		auto w = new CImageViewer();
-		auto ImageIndex = randomNumberBounded(4);
-		auto FileName = ":adsdemo/images/ads_logo.svg";
-
-		// Pick a random image from a number of images
-		switch (ImageIndex)
-		{
-		case 0: FileName = ":adsdemo/images/ads_tile_blue.svg"; break;
-		case 1: FileName = ":adsdemo/images/ads_tile_blue_light.svg"; break;
-		case 2: FileName = ":adsdemo/images/ads_tile_green.svg"; break;
-		case 3: FileName = ":adsdemo/images/ads_tile_orange.svg"; break;
-		}
-
-		auto Result = w->loadFile(FileName);
-		qDebug() << "loadFile result: " << Result;
-		ads::CDockWidget* DockWidget = DockManager->createDockWidget(QString("Image Viewer %1").arg(ImageViewerCount++));
-		DockWidget->setIcon(svgIcon(":/adsdemo/images/photo.svg"));
-		DockWidget->setWidget(w,ads:: CDockWidget::ForceNoScrollArea);
-		auto ToolBar = DockWidget->createDefaultToolBar();
-		ToolBar->addActions(w->actions());
-		return DockWidget;
-	}
-
 	/**
 	 * Create a table widget
 	 */
@@ -378,7 +323,7 @@ struct MainWindowPrivate
 	{
 		static int TableCount = 0;
 		auto w = new CMinSizeTableWidget();
-		ads::CDockWidget* DockWidget = DockManager->createDockWidget(QString("Table %1").arg(TableCount++));
+		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Table %1").arg(TableCount++));
 		static int colCount = 5;
 		static int rowCount = 30;
 		w->setColumnCount(colCount);
@@ -396,7 +341,7 @@ struct MainWindowPrivate
 		DockWidget->setMinimumSizeHintMode(ads::CDockWidget::MinimumSizeHintFromContent);
 		auto ToolBar = DockWidget->createDefaultToolBar();
 		auto Action = ToolBar->addAction(svgIcon(":/adsdemo/images/fullscreen.svg"), "Toggle Fullscreen");
-		QObject::connect(Action, &QAction::triggered, [DockWidget]()
+		QObject::connect(Action, &QAction::triggered, [=]()
 			{
 				if (DockWidget->isFullScreen())
 				{
@@ -411,17 +356,6 @@ struct MainWindowPrivate
 		return DockWidget;
 	}

-	/**
-	 * Create QQuickWidget for test for OpenGL and QQuick
-	 */
-	ads::CDockWidget *createQQuickWidget()
-	{
-		QQuickWidget *widget = new QQuickWidget();
-		ads::CDockWidget *dockWidget = DockManager->createDockWidget("Quick");
-		dockWidget->setWidget(widget);
-		return dockWidget;
-	}
-

 #ifdef Q_OS_WIN
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
@@ -432,13 +366,14 @@ struct MainWindowPrivate
 	{
 	   static int ActiveXCount = 0;
 	   QAxWidget* w = new QAxWidget("{6bf52a52-394a-11d3-b153-00c04f79faa6}", parent);
-	   ads::CDockWidget* DockWidget = DockManager->createDockWidget(QString("Active X %1").arg(ActiveXCount++));
+	   ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Active X %1").arg(ActiveXCount++));
 	   DockWidget->setWidget(w);
 	   ui.menuView->addAction(DockWidget->toggleViewAction());
 	   return DockWidget;
 	}
 #endif
 #endif
+
 };

 //============================================================================
@@ -451,8 +386,8 @@ void MainWindowPrivate::createContent()

 	// For this Special Dock Area we want to avoid dropping on the center of it (i.e. we don't want this widget to be ever tabbified):
 	{
-		//SpecialDockArea->setAllowedAreas(ads::OuterDockAreas);
-		SpecialDockArea->setAllowedAreas({ads::LeftDockWidgetArea, ads::RightDockWidgetArea, ads::TopDockWidgetArea}); // just for testing
+		SpecialDockArea->setAllowedAreas(ads::OuterDockAreas);
+		//SpecialDockArea->setAllowedAreas({ads::LeftDockWidgetArea, ads::RightDockWidgetArea}); // just for testing
 	}

 	DockWidget = createLongTextLabelDockWidget();
@@ -470,35 +405,18 @@ void MainWindowPrivate::createContent()
 	appendFeaturStringToWindowTitle(FileSystemWidget);

 	// Test custom factory - we inject a help button into the title bar
-	DockManager->setComponentsFactory(new CCustomComponentsFactory());
+	ads::CDockComponentsFactory::setFactory(new CCustomComponentsFactory());
 	auto TopDockArea = DockManager->addDockWidget(ads::TopDockWidgetArea, FileSystemWidget);
 	// Uncomment the next line if you would like to test the
 	// HideSingleWidgetTitleBar functionality
 	// TopDockArea->setDockAreaFlag(ads::CDockAreaWidget::HideSingleWidgetTitleBar, true);
-	DockManager->setComponentsFactory(ads::CDockComponentsFactory::factory());
+	ads::CDockComponentsFactory::resetDefaultFactory();

 	// We create a calendar widget and clear all flags to prevent the dock area
 	// from closing
 	DockWidget = createCalendarDockWidget();
 	DockWidget->setTabToolTip(QString("Tab ToolTip\nHodie est dies magna"));
 	auto DockArea = DockManager->addDockWidget(ads::CenterDockWidgetArea, DockWidget, TopDockArea);
-    // Now we create a action to test resizing of DockArea widget
-	auto Action = ui.menuTests->addAction(QString("Resize %1").arg(DockWidget->windowTitle()));
-	QObject::connect(Action, &QAction::triggered, [DockArea]()
-	{
-		// Resizing only works, if the Splitter is visible and has a valid
-		// sizes
-		auto Splitter = ads::internal::findParent<ads::CDockSplitter*>(DockArea);
-		if (!Splitter)
-		{
-			return;
-		}
-		// We change the sizes of the splitter that contains the Calendar 1 widget
-		// to resize the dock widget
-		int Width = Splitter->width();
-		Splitter->setSizes({Width * 2/3, Width * 1/3});
-	});
-	DockWidget->setWindowTitle(QString("My " + DockWidget->windowTitle()));

 	// Now we add a custom button to the dock area title bar that will create
 	// new editor widgets when clicked
@@ -510,7 +428,7 @@ void MainWindowPrivate::createContent()
 	auto TitleBar = DockArea->titleBar();
 	int Index = TitleBar->indexOf(TitleBar->tabBar());
 	TitleBar->insertWidget(Index + 1, CustomButton);
-	QObject::connect(CustomButton, &QToolButton::clicked, [DockArea, this]()
+	QObject::connect(CustomButton, &QToolButton::clicked, [=]()
 	{
 		auto DockWidget = createEditorWidget();
 		DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
@@ -520,48 +438,24 @@ void MainWindowPrivate::createContent()

 	// Test dock area docking
 	auto RighDockArea = DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(), TopDockArea);
-	DockWidget = createLongTextLabelDockWidget();
-	DockWidget->setFeature(ads::CDockWidget::DockWidgetPinnable, false);
-	DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget, RighDockArea);
+	DockManager->addDockWidget(ads::TopDockWidgetArea, createLongTextLabelDockWidget(), RighDockArea);
 	auto BottomDockArea = DockManager->addDockWidget(ads::BottomDockWidgetArea, createLongTextLabelDockWidget(), RighDockArea);
 	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(), RighDockArea);
-	auto LabelDockWidget = createLongTextLabelDockWidget();
-	DockManager->addDockWidget(ads::CenterDockWidgetArea, LabelDockWidget, BottomDockArea);
+	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(), BottomDockArea);

-	// Tests CustomCloseHandling without DeleteOnClose
-	LabelDockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
-	LabelDockWidget->setWindowTitle(LabelDockWidget->windowTitle() + " [Custom Close]");
-	QObject::connect(LabelDockWidget, &ads::CDockWidget::closeRequested, [LabelDockWidget, this]()
-	{
-		int Result = QMessageBox::question(_this, "Custom Close Request",
-			"Do you really want to close this dock widget?");
-		if (QMessageBox::Yes == Result)
-		{
-			LabelDockWidget->closeDockWidget();
-		}
-	});
-
-    Action = ui.menuTests->addAction(QString("Set %1 Floating").arg(DockWidget->windowTitle()));
+    auto Action = ui.menuTests->addAction(QString("Set %1 Floating").arg(DockWidget->windowTitle()));
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating()));
    Action = ui.menuTests->addAction(QString("Set %1 As Current Tab").arg(DockWidget->windowTitle()));
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setAsCurrentTab()));
    Action = ui.menuTests->addAction(QString("Raise %1").arg(DockWidget->windowTitle()));
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(raise()));

-    // Test hidden floating dock widget
-    DockWidget = createLongTextLabelDockWidget();
-    DockManager->addDockWidgetFloating(DockWidget);
-    DockWidget->toggleView(false);
-
-    // Test visible floating dock widget
-    DockWidget = createCalendarDockWidget();
-    DockManager->addDockWidgetFloating(DockWidget);
-    DockWidget->setWindowTitle(QString("My " + DockWidget->windowTitle()));
-
-
 #ifdef Q_OS_WIN
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-    DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(), RighDockArea);
+    if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking))
+    {
+    	DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(), RighDockArea);
+    }
 #endif
 #endif

@@ -570,15 +464,6 @@ void MainWindowPrivate::createContent()
 		_this->connect(DockWidget, SIGNAL(viewToggled(bool)), SLOT(onViewToggled(bool)));
 		_this->connect(DockWidget, SIGNAL(visibilityChanged(bool)), SLOT(onViewVisibilityChanged(bool)));
 	}
-
-	// Create image viewer
-	DockWidget = createImageViewer();
-	DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
-
-    // Create quick widget
-	DockWidget = createQQuickWidget();
-	DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, true);
-	DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
 }


@@ -591,29 +476,19 @@ void MainWindowPrivate::createActions()
 	ui.toolBar->addAction(ui.actionRestoreState);
 	ui.actionRestoreState->setIcon(svgIcon(":/adsdemo/images/restore.svg"));

-	ui.toolBar->addSeparator();
-
-	QAction* a = ui.toolBar->addAction("Lock Workspace");
-	a->setIcon(svgIcon(":/adsdemo/images/lock_outline.svg"));
-	a->setCheckable(true);
-	a->setChecked(false);
-	QObject::connect(a, &QAction::triggered, _this, &CMainWindow::lockWorkspace);
-
+	SavePerspectiveAction = new QAction("Create Perspective", _this);
+	SavePerspectiveAction->setIcon(svgIcon(":/adsdemo/images/picture_in_picture.svg"));
+	_this->connect(SavePerspectiveAction, SIGNAL(triggered()), SLOT(savePerspective()));
 	PerspectiveListAction = new QWidgetAction(_this);
 	PerspectiveComboBox = new QComboBox(_this);
 	PerspectiveComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 	PerspectiveListAction->setDefaultWidget(PerspectiveComboBox);
+	ui.toolBar->addSeparator();
 	ui.toolBar->addAction(PerspectiveListAction);
-
-	a = SavePerspectiveAction = ui.toolBar->addAction("Create Perspective");
-	a->setIcon(svgIcon(":/adsdemo/images/picture_in_picture.svg"));
-	QObject::connect(a, &QAction::triggered, _this, &CMainWindow::savePerspective);
 	ui.toolBar->addAction(SavePerspectiveAction);

-	ui.toolBar->addSeparator();
-
-	a = ui.toolBar->addAction("Create Floating Editor");
+	QAction* a = ui.toolBar->addAction("Create Floating Editor");
 	a->setProperty("Floating", true);
 	a->setToolTip("Creates floating dynamic dockable editor windows that are deleted on close");
 	a->setIcon(svgIcon(":/adsdemo/images/note_add.svg"));
@@ -627,37 +502,12 @@ void MainWindowPrivate::createActions()
 	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
 	ui.menuTests->addAction(a);

-	a = ui.toolBar->addAction("Create Editor Tab");
-	a->setProperty("Floating", false);
-	a->setToolTip("Creates a editor tab and inserts it as second tab into an area");
-	a->setIcon(svgIcon(":/adsdemo/images/tab.svg"));
-	a->setProperty("Tabbed", true);
-	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
-	ui.menuTests->addAction(a);
-
-	ui.toolBar->addSeparator();
 	a = ui.toolBar->addAction("Create Floating Table");
 	a->setToolTip("Creates floating dynamic dockable table with millions of entries");
 	a->setIcon(svgIcon(":/adsdemo/images/grid_on.svg"));
 	_this->connect(a, SIGNAL(triggered()), SLOT(createTable()));
 	ui.menuTests->addAction(a);

-	a = ui.toolBar->addAction("Create Image Viewer");
-	auto ToolButton = qobject_cast<QToolButton*>(ui.toolBar->widgetForAction(a));
-	ToolButton->setPopupMode(QToolButton::InstantPopup);
-	a->setToolTip("Creates floating, docked or pinned image viewer");
-	a->setIcon(svgIcon(":/adsdemo/images/panorama.svg"));
-	ui.menuTests->addAction(a);
-	auto Menu = new QMenu();
-	ToolButton->setMenu(Menu);
-	a = Menu->addAction("Floating Image Viewer");
-	_this->connect(a, SIGNAL(triggered()), SLOT(createImageViewer()));
-	a = Menu->addAction("Docked Image Viewer");
-	_this->connect(a, SIGNAL(triggered()), SLOT(createImageViewer()));
-	a = Menu->addAction("Pinned Image Viewer");
-	_this->connect(a, SIGNAL(triggered()), SLOT(createImageViewer()));
-
-
 	ui.menuTests->addSeparator();
 	a = ui.menuTests->addAction("Show Status Dialog");
 	_this->connect(a, SIGNAL(triggered()), SLOT(showStatusDialog()));
@@ -665,12 +515,6 @@ void MainWindowPrivate::createActions()
 	a = ui.menuTests->addAction("Toggle Label 0 Window Title");
 	_this->connect(a, SIGNAL(triggered()), SLOT(toggleDockWidgetWindowTitle()));
 	ui.menuTests->addSeparator();
-
-	a = ui.toolBar->addAction("Apply VS Style");
-	a->setToolTip("Applies a Visual Studio light style (visual_studio_light.css)." );
-	a->setIcon(svgIcon(":/adsdemo/images/color_lens.svg"));
-	QObject::connect(a, &QAction::triggered, _this, &CMainWindow::applyVsStyle);
-	ui.menuTests->addAction(a);
 }


@@ -730,7 +574,7 @@ CMainWindow::CMainWindow(QWidget *parent) :

    // uncomment the following line if you want to use opaque undocking and
 	// opaque splitter resizing
-    //CDockManager::setConfigFlags(CDockManager::DefaultOpaqueConfig);
+    // CDockManager::setConfigFlags(CDockManager::DefaultOpaqueConfig);

    // uncomment the following line if you want a fixed tab width that does
 	// not change if the visibility of the close button changes
@@ -760,35 +604,25 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// uncomment the following line if you want a central widget in the main dock container (the dock manager) without a titlebar
 	// If you enable this code, you can test it in the demo with the Calendar 0
 	// dock widget.
-	//CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);
+	// CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);

 	// uncomment the following line to enable focus highlighting of the dock
 	// widget that has the focus
-    CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
-
-	// uncomment if you would like to enable dock widget auto hiding
-    CDockManager::setAutoHideConfigFlags({CDockManager::DefaultAutoHideConfig});
-
-    // uncomment if you would like to disable closing auto hide widget with mouse click outside of auto hide container
-    //CDockManager::setAutoHideConfigFlag(CDockManager::AutoHideCloseOnOutsideMouseClick, false);
+	CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);

 	// uncomment if you would like to enable an equal distribution of the
 	// available size of a splitter to all contained dock widgets
 	// CDockManager::setConfigFlag(CDockManager::EqualSplitOnInsertion, true);
-	
-	// uncomment if you would like to close tabs with the middle mouse button, web browser style
-	// CDockManager::setConfigFlag(CDockManager::MiddleMouseButtonClosesTab, true);

 	// Now create the dock manager and its content
 	d->DockManager = new CDockManager(this);
-	d->DockManager->setDockWidgetToolBarStyle(Qt::ToolButtonIconOnly, ads::CDockWidget::StateFloating);

 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-	connect(d->PerspectiveComboBox, SIGNAL(activated(QString)),
-		d->DockManager, SLOT(openPerspective(QString)));
+	connect(d->PerspectiveComboBox, SIGNAL(activated(const QString&)),
+		d->DockManager, SLOT(openPerspective(const QString&)));
 #else
-    connect(d->PerspectiveComboBox, SIGNAL(textActivated(QString)),
-        d->DockManager, SLOT(openPerspective(QString)));
+    connect(d->PerspectiveComboBox, SIGNAL(textActivated(const QString&)),
+        d->DockManager, SLOT(openPerspective(const QString&)));
 #endif

 	d->createContent();
@@ -860,14 +694,13 @@ void CMainWindow::savePerspective()
 //============================================================================
 void CMainWindow::onViewToggled(bool Open)
 {
-	Q_UNUSED(Open);
 	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
 	if (!DockWidget)
 	{
 		return;
 	}

-	//qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
+	qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
 }


@@ -891,8 +724,6 @@ void CMainWindow::createEditor()
 	QObject* Sender = sender();
 	QVariant vFloating = Sender->property("Floating");
 	bool Floating = vFloating.isValid() ? vFloating.toBool() : true;
-	QVariant vTabbed = Sender->property("Tabbed");
-	bool Tabbed = vTabbed.isValid() ? vTabbed.toBool() : true;
 	auto DockWidget = d->createEditorWidget();
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetForceCloseWithArea, true);
@@ -904,38 +735,31 @@ void CMainWindow::createEditor()
 		FloatingWidget->move(QPoint(20, 20));
 		d->LastCreatedFloatingEditor = DockWidget;
 		d->LastDockedEditor.clear();
-		return;
    }
-
-
-	ads::CDockAreaWidget* EditorArea = d->LastDockedEditor ? d->LastDockedEditor->dockAreaWidget() : nullptr;
-	if (EditorArea)
-	{
-		if (Tabbed)
-		{
-			// Test inserting the dock widget tab at a given position instead
-			// of appending it. This function inserts the new dock widget as
-			// first tab
-			d->DockManager->addDockWidgetTabToArea(DockWidget, EditorArea, 0);
-		}
-		else
-		{
-			d->DockManager->setConfigFlag(ads::CDockManager::EqualSplitOnInsertion, true);
-			d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
-		}
-	}
-	else
-	{
-		if (d->LastCreatedFloatingEditor)
-		{
-			d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, d->LastCreatedFloatingEditor->dockAreaWidget());
-		}
-		else
-		{
-			d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
-		}
-	}
-	d->LastDockedEditor = DockWidget;
+    else
+    {
+    	ads::CDockAreaWidget* EditorArea = d->LastDockedEditor ? d->LastDockedEditor->dockAreaWidget() : nullptr;
+    	if (EditorArea)
+    	{
+    		std::cout << "DockAreaCount before: " << EditorArea->dockContainer()->dockAreaCount() << std::endl;
+    		d->DockManager->setConfigFlag(ads::CDockManager::EqualSplitOnInsertion, true);
+    		d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
+    		std::cout << "DockAreaCount after: " << DockWidget->dockContainer()->dockAreaCount() << std::endl;
+    	}
+    	else
+    	{
+    		if (d->LastCreatedFloatingEditor)
+    		{
+    			std::cout << "LastCreated" << std::endl;
+    			d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, d->LastCreatedFloatingEditor->dockAreaWidget());
+    		}
+    		else
+    		{
+    			d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    		}
+    	}
+    	d->LastDockedEditor = DockWidget;
+    }
 }


@@ -953,20 +777,6 @@ void CMainWindow::onEditorCloseRequested()
 }


-//============================================================================
-void CMainWindow::onImageViewerCloseRequested()
-{
-	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
-	int Result = QMessageBox::question(this, "Close Image Viewer", QString("%1 "
-		"contains unsaved changes? Would you like to close it?")
-		.arg(DockWidget->windowTitle()));
-	if (QMessageBox::Yes == Result)
-	{
-		DockWidget->closeDockWidget();
-	}
-}
-
-
 //============================================================================
 void CMainWindow::createTable()
 {
@@ -1001,59 +811,3 @@ void CMainWindow::toggleDockWidgetWindowTitle()
 	d->WindowTitleTestDockWidget->setWindowTitle(Title);
 }

-
-//============================================================================
-void CMainWindow::applyVsStyle()
-{
-	QFile StyleSheetFile(":adsdemo/res/visual_studio_light.css");
-	StyleSheetFile.open(QIODevice::ReadOnly);
-	QTextStream StyleSheetStream(&StyleSheetFile);
-	auto Stylesheet = StyleSheetStream.readAll();
-	StyleSheetFile.close();
-	d->DockManager->setStyleSheet(Stylesheet);
-}
-
-
-//============================================================================
-void CMainWindow::createImageViewer()
-{
-	QAction* a = qobject_cast<QAction*>(sender());
-	qDebug() << "createImageViewer " << a->text();
-
-	auto DockWidget = d->createImageViewer();
-	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
-	DockWidget->setFeature(ads::CDockWidget::DockWidgetForceCloseWithArea, true);
-	DockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
-	DockWidget->resize(QSize(640, 480));
-	connect(DockWidget, &ads::CDockWidget::closeRequested, this,
-		&CMainWindow::onImageViewerCloseRequested);
-
-	if (a->text().startsWith("Floating"))
-	{
-		auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
-		FloatingWidget->move(QPoint(20, 20));
-	}
-	else if (a->text().startsWith("Docked"))
-	{
-		d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget);
-	}
-	else if (a->text().startsWith("Pinned"))
-	{
-		d->DockManager->addAutoHideDockWidget(ads::SideBarLeft, DockWidget);
-	}
-}
-
-
-//============================================================================
-void CMainWindow::lockWorkspace(bool Value)
-{
-	if (Value)
-	{
-		d->DockManager->lockDockWidgetFeaturesGlobally();
-	}
-	else
-	{
-		d->DockManager->lockDockWidgetFeaturesGlobally(ads::CDockWidget::NoDockWidgetFeatures);
-	}
-}
-
--- a/demo/MainWindow.h
+++ b/demo/MainWindow.h
@@ -63,12 +63,8 @@ private slots:
 	void createEditor();
 	void createTable();
 	void onEditorCloseRequested();
-	void onImageViewerCloseRequested();
 	void showStatusDialog();
 	void toggleDockWidgetWindowTitle();
-	void applyVsStyle();
-	void createImageViewer();
-	void lockWorkspace(bool Value);
 };

 #endif // MAINWINDOW_H
--- a/demo/MyDockAreaTitleBar.h
+++ b/demo/MyDockAreaTitleBar.h
@@ -1,58 +0,0 @@
-#ifndef QTADS_MYDOCKAREATITLEBAR_H
-#define QTADS_MYDOCKAREATITLEBAR_H
-/*******************************************************************************
-** Qt Advanced Docking System
-** Copyright (C) 2017 Uwe Kindler
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public
-** License along with this library; If not, see <http://www.gnu.org/licenses/>.
-******************************************************************************/
-
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <DockAreaTitleBar.h>
-
-
-/**
- * Custom DockAreaTitleBar that adds a custom context menu
- */
-class MyDockAreaTitleBar : public ads::CDockAreaTitleBar
-{
-public:
-	explicit MyDockAreaTitleBar(ads::CDockAreaWidget *parent) :
-		CDockAreaTitleBar(parent)
-	{
-	}
-
-	QMenu* buildContextMenu(QMenu*) override
-	{
-		auto menu = ads::CDockAreaTitleBar::buildContextMenu(nullptr);
-		menu->addSeparator();
-		auto action = menu->addAction(tr("Format HardDrive"));
-
-		connect(action, &QAction::triggered, this, [this]()
-		{
-			QMessageBox msgBox;
-			msgBox.setText("No, just kidding");
-			msgBox.setStandardButtons(QMessageBox::Abort);
-			msgBox.setDefaultButton(QMessageBox::Abort);
-			msgBox.exec();
-		});
-
-		return menu;
-	}
-};
-
-#endif  // QTADS_MYDOCKAREATITLEBAR_H
--- a/demo/RenderWidget.cpp
+++ b/demo/RenderWidget.cpp
@@ -1,108 +0,0 @@
-//============================================================================
-/// \file   RenderWidget.cpp
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Implementation of CRenderWidget
-//============================================================================
-
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include "RenderWidget.h"
-
-#include <QPainter>
-#include <math.h>
-
-
-//===========================================================================
-CRenderWidget::CRenderWidget(QWidget* Parent) :
-	QWidget(Parent), m_ScaleFactor(1)
-{
-	this->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-	this->setCursor(Qt::OpenHandCursor);
-}
-
-//===========================================================================
-CRenderWidget::~CRenderWidget()
-{
-
-}
-
-//===========================================================================
-void CRenderWidget::showImage(const QImage& Image)
-{
-	m_Image = QPixmap::fromImage(Image);
-	this->adjustWidgetSize();
-	this->repaint();
-}
-
-//===========================================================================
-void CRenderWidget::paintEvent(QPaintEvent* Event)
-{
-	Q_UNUSED(Event);
-	QPainter Painter(this);
-	Painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
-	Painter.setRenderHint(QPainter::Antialiasing, true);
-	Painter.scale(m_ScaleFactor, m_ScaleFactor);
-	Painter.drawPixmap(QPoint(0, 0), m_Image);
-}
-
-//============================================================================
-void CRenderWidget::zoomIn()
-{
-	scaleImage(1.25);
-}
-
-//============================================================================
-void CRenderWidget::zoomOut()
-{
-	scaleImage(0.8);
-}
-
-//============================================================================
-void CRenderWidget::zoomByValue(double ZoomValue)
-{
-	scaleImage(ZoomValue);
-}
-
-//============================================================================
-void CRenderWidget::normalSize()
-{
-	m_ScaleFactor = 1;
-	this->adjustWidgetSize();
-}
-
-//============================================================================
-void CRenderWidget::scaleImage(double ScaleFactor)
-{
-	m_ScaleFactor *= ScaleFactor;
-	this->adjustWidgetSize();
-}
-
-//============================================================================
-void CRenderWidget::adjustWidgetSize()
-{
-	QSize ScaledImageSize = m_Image.size() * m_ScaleFactor;
-	if (ScaledImageSize != this->size())
-	{
-		this->setFixedSize(ScaledImageSize);
-	}
-}
-
-//============================================================================
-void CRenderWidget::scaleToSize(const QSize& TargetSize)
-{
-	if (m_Image.isNull())
-	{
-		return;
-	}
-	double ScaleFactorH = (double) TargetSize.width() / m_Image.size().width();
-	double ScaleFactorV = (double) TargetSize.height()
-	    / m_Image.size().height();
-	m_ScaleFactor = (ScaleFactorH < ScaleFactorV) ? ScaleFactorH : ScaleFactorV;
-	this->adjustWidgetSize();
-}
-
-//---------------------------------------------------------------------------
-// EOF RenderWidget.cpp
--- a/demo/RenderWidget.h
+++ b/demo/RenderWidget.h
@@ -1,111 +0,0 @@
-#ifndef RenderWidgetH
-#define RenderWidgetH
-//============================================================================
-/// \file   RenderWidget.h
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Declaration of CRenderWidget
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <QWidget>
-#include <QPixmap>
-
-//============================================================================
-//                           FORWARD DECLARATIONS
-//============================================================================
-class QImage;
-
-
-/**
- * @brief Widget for fast display of images (i.e. for video capture devices)
- */
-class CRenderWidget : public QWidget
-{
-	Q_OBJECT
-private:
-	QPixmap m_Image;
-	double m_ScaleFactor;
-
-protected:
-	/**
-	 * @brief Reimplemented paint event method showing actual image.
-	 */
-	void paintEvent(QPaintEvent* PaintEvent);
-
-	/**
-	 * @brief Change scale factor
-	 */
-	void scaleImage(double ScaleFactor);
-
-	/**
-	 * @brief Adjust widget size to size of image.
-	 */
-	void adjustWidgetSize();
-
-public:
-	/**
-	 * Constructor
-	 * @param[in] Parent Parent widget.
-	 */
-	CRenderWidget(QWidget* Parent);
-
-	/**
-	 * Destructor
-	 */
-	virtual ~CRenderWidget();
-
-signals:
-	/**
-	 * @brief Signalize change of captured image size.
-	 * @param ImageSize New image size.
-	 */
-	void imageSizeChanged(const QSize& ImageSize);
-
-public slots:
-	/**
-	 * @brief Show new image in render widget.
-	 */
-	void showImage(const QImage& Image);
-
-	/**
-	 * @brief Zoom into the scene.
-	 * This function decreases the scaling factor by setting it to the previous
-	 * value in internal scaling list.
-	 * @brief Steps The number of steps to zoom in. One step is 25%.
-	 */
-	void zoomIn();
-
-	/**
-	 * @brief Zoom out of the scene.
-	 * This function decreases the scaling factor by setting it to the next
-	 * value in internal scaling list.
-	 * @brief Steps The number of steps to zoom out. One step is 25%.
-	 */
-	void zoomOut();
-
-	/**
-	 * @brief Change zoom by zoom value.
-	 * @param[in] ZoomValue This is the zoom value to apply. A value of 1
-	 * means no change a value > 1 increases the image (i.e. 1.25 would increase
-	 * the image by 25%) and a value of < 1 decreases the image size (i.e.
-	 * a value of 0.8 would decrease the image size by 25%).
-	 */
-	void zoomByValue(double ZoomValue);
-
-	/**
-	 * @brief Resets the actual scaling to 1 and display the image with its
-	 *        actual pixel size.
-	 */
-	void normalSize();
-
-	/**
-	 * @brief Scales the wiget and its content image to the given TargetSize
-	 */
-	void scaleToSize(const QSize& TargetSize);
-}; // class CRenderWidget
-
-//---------------------------------------------------------------------------
-#endif // RenderWidgetH
--- a/demo/app.ico
+++ b/demo/app.ico
--- a/demo/app.rc
+++ b/demo/app.rc
@@ -1 +0,0 @@
-IDI_ICON1               ICON    DISCARDABLE     "app.ico"
--- a/demo/demo.pro
+++ b/demo/demo.pro
@@ -2,7 +2,7 @@ ADS_OUT_ROOT = $${OUT_PWD}/..

 TARGET = AdvancedDockingSystemDemo
 DESTDIR = $${ADS_OUT_ROOT}/lib
-QT += core gui widgets quick quickwidgets
+QT += core gui widgets

 include(../ads.pri)

@@ -15,25 +15,19 @@ lessThan(QT_MAJOR_VERSION, 6) {
 CONFIG += c++14
 CONFIG += debug_and_release
 DEFINES += QT_DEPRECATED_WARNINGS
-RC_FILE += app.rc

 adsBuildStatic {
    DEFINES += ADS_STATIC
 }

-
-HEADERS += \
-	MainWindow.h \
-	StatusDialog.h \
-	ImageViewer.h \
-	RenderWidget.h
-
 SOURCES += \
 	main.cpp \
 	MainWindow.cpp \
-	StatusDialog.cpp \
-	ImageViewer.cpp \
-	RenderWidget.cpp
+	StatusDialog.cpp
+
+HEADERS += \
+	MainWindow.h \
+	StatusDialog.h

 FORMS += \
 	mainwindow.ui \
--- a/demo/demo.py
+++ b/demo/demo.py
@@ -215,17 +215,6 @@ class MainWindow(MainWindowUI, MainWindowBase):
        dock_widget = self.create_calendar_dock_widget()
        dock_widget.setTabToolTip("Tab ToolTip\nHodie est dies magna")
        dock_area = self.dock_manager.addDockWidget(QtAds.CenterDockWidgetArea, dock_widget, top_dock_area)
-        # Now we create a action to test resizing of DockArea widget
-        action = self.menuTests.addAction("Resize {}".format(dock_widget.windowTitle()))
-        def action_triggered():
-            splitter = QtAds.internal.findParent(QtAds.CDockSplitter, dock_area)
-            if not splitter:
-                return
-            # We change the sizes of the splitter that contains the Calendar 1 widget
-            # to resize the dock widget
-            width = splitter.width()
-            splitter.setSizes([width * 2/3, width * 1/3])
-        action.triggered.connect(action_triggered)

        # Now we add a custom button to the dock area title bar that will create
        # new editor widgets when clicked
@@ -370,7 +359,6 @@ class MainWindow(MainWindowUI, MainWindowBase):
        floating = sender.property("Floating")
        dock_widget = self.create_editor_widget()
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetDeleteOnClose, True)
-        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetForceCloseWithArea, True)
        dock_widget.closeRequested.connect(self.on_editor_close_requested)
        
        if floating:
--- a/demo/demo.qrc
+++ b/demo/demo.qrc
@@ -17,27 +17,5 @@
        <file>images/create_floating_editor.svg</file>
        <file>images/create_floating_table.svg</file>
        <file>images/docked_editor.svg</file>
-        <file>images/tab.svg</file>
-        <file>res/visual_studio_light.css</file>
-        <file>images/color_lens.svg</file>
-        <file>images/ads_icon.svg</file>
-        <file>images/ads_logo.svg</file>
-        <file>images/find_in_page.svg</file>
-        <file>images/perm_media.svg</file>
-        <file>images/zoom_in.svg</file>
-        <file>images/zoom_out.svg</file>
-        <file>images/zoom_out_map.svg</file>
-        <file>images/ads_tile_blue.svg</file>
-        <file>images/ads_tile_blue_light.svg</file>
-        <file>images/ads_tile_green.svg</file>
-        <file>images/ads_tile_orange.svg</file>
-        <file>images/photo.svg</file>
-        <file>images/crop_original.svg</file>
-        <file>images/panorama.svg</file>
-        <file>images/ads_icon2.svg</file>
-        <file>images/font_download.svg</file>
-        <file>images/lock_outline.svg</file>
-        <file>images/lock.svg</file>
-        <file>images/lock_open.svg</file>
    </qresource>
 </RCC>
--- a/demo/images/ads_icon.svg
+++ b/demo/images/ads_icon.svg
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
- <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956"/></text>
- <g transform="translate(581.23 1750.5)">
-  <path d="m191.64-726.53h-521.75c-138.69 0-251.12-112.43-251.12-251.12v-521.75c0-138.69 112.43-251.12 251.12-251.12h521.75c138.69 0 251.12 112.43 251.12 251.12v521.75c0 138.69-112.43 251.12-251.12 251.12z" fill="#e0e0e0" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1515.9v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-  <path d="m80.1-1217.2v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1217.2v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-  <path d="m-431.9-1515.9v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
- </g>
-</svg>
--- a/demo/images/ads_icon2.svg
+++ b/demo/images/ads_icon2.svg
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
- <desc>electric_iron icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
- <g transform="matrix(1.4118 0 0 1.4118 -210.82 -210.82)" stroke-width=".50173">
-  <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956" stroke-width=".70833"/></text>
-  <path d="m405.33 234.66v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-  <path d="m661.33 533.33v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-  <path d="m405.33 533.33v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-  <path d="m149.33 234.66v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
- </g>
-</svg>
--- a/demo/images/ads_logo.svg
+++ b/demo/images/ads_logo.svg
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6907.3" height="1024" version="1.1" viewBox="0 0 6907.3 1024" xmlns="http://www.w3.org/2000/svg">
- <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956"/></text>
- <text x="1178.9221" y="718.37329" fill="#8f918f" font-family="sans-serif" font-size="628px" style="line-height:1.25" xml:space="preserve"><tspan x="1178.9221" y="718.37329" fill="#8f918f" font-family="'Segoe UI'" font-size="628px" font-weight="300">Qt Advanced Docking</tspan></text>
- <g transform="translate(581.23 1750.5)">
-  <path d="m191.64-726.53h-521.75c-138.69 0-251.12-112.43-251.12-251.12v-521.75c0-138.69 112.43-251.12 251.12-251.12h521.75c138.69 0 251.12 112.43 251.12 251.12v521.75c0 138.69-112.43 251.12-251.12 251.12z" fill="#e0e0e0" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1515.9v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-  <path d="m80.1-1217.2v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1217.2v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-  <path d="m-431.9-1515.9v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
- </g>
-</svg>
--- a/demo/images/ads_tile_blue.svg
+++ b/demo/images/ads_tile_blue.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 270.93 270.93" xmlns="http://www.w3.org/2000/svg">
- <path d="m-2.5e-6 -2.5e-6v270.93h270.93v-270.93z" fill="#0083c3" stroke-width=".26458" style="mix-blend-mode:normal"/>
- <g fill="#fff" fill-opacity=".25">
-  <g transform="matrix(.12402 0 0 .12402 71.967 73.674)" stroke-width="4.7887">
-   <path d="m405.33 234.66v256h469.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m661.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m405.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m149.33 234.66v554.67h213.33v-554.67z" style="mix-blend-mode:normal"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Docking">
-   <path d="m100.07 182.94q0 2.7805-1.5208 4.1938-1.5054 1.3979-4.2091 1.3979h-3.057v-10.968h3.3796q1.6437 0 2.8573 0.61447 1.2289 0.61446 1.8895 1.8127 0.66055 1.1982 0.66055 2.9494zm-1.4594 0.0461q0-2.1967-1.0907-3.2106-1.0753-1.0292-3.057-1.0292h-1.7973v8.6026h1.4901q4.4549 0 4.4549-4.3627z"/>
-   <path d="m114.84 184.4q0 2.0431-1.0446 3.1645-1.0292 1.1214-2.7958 1.1214-1.0907 0-1.9509-0.49158-0.84489-0.50693-1.3365-1.4594-0.49158-0.96778-0.49158-2.335 0-2.0431 1.0139-3.1491 1.0292-1.106 2.8112-1.106 1.106 0 1.9663 0.50694 0.86026 0.49157 1.3365 1.444 0.49158 0.93706 0.49158 2.3042zm-6.2215 0q0 1.4594 0.56838 2.3196 0.58374 0.84489 1.8434 0.84489 1.2443 0 1.828-0.84489 0.58374-0.86025 0.58374-2.3196 0-1.4594-0.58374-2.2889-0.58375-0.82953-1.8434-0.82953t-1.828 0.82953-0.56838 2.2889z"/>
-   <path d="m125.64 188.69q-1.106 0-1.9509-0.44549-0.84489-0.44549-1.3365-1.3826-0.47622-0.93707-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50693-0.95243 1.3826-1.3979t1.9817-0.44549q0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41477 1.1214q-0.36868-0.13826-0.86025-0.26115-0.49158-0.1229-0.9217-0.1229-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13825 0.95242-0.33795v1.1982q-0.41476 0.21506-0.9217 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m136.4 176.86v6.0986q0 0.24579-0.0307 0.6452-0.0154 0.3994-0.0307 0.69127h0.0614q0.0922-0.12289 0.27651-0.35332 0.18434-0.23042 0.36868-0.46085 0.19971-0.24578 0.33796-0.3994l2.6268-2.7805h1.5823l-3.3335 3.5178 3.5639 4.716h-1.6283l-2.8573-3.8404-0.93707 0.81417v3.0262h-1.3365v-11.675z"/>
-   <path d="m149.32 177.22q0.30724 0 0.53766 0.21506 0.24579 0.1997 0.24579 0.64519t-0.24579 0.66056q-0.23042 0.1997-0.53766 0.1997-0.33795 0-0.56838-0.1997-0.23042-0.21507-0.23042-0.66056t0.23042-0.64519q0.23043-0.21506 0.56838-0.21506zm0.66056 3.0877v8.2339h-1.3518v-8.2339z"/>
-   <path d="m161.92 180.15q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808-0.5223 0.76809-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95242 0.70664-0.3226 1.4901-0.3226z"/>
-   <path d="m175.73 180.15q0.81417 0 1.4594 0.30724 0.66055 0.30723 1.1214 0.93706h0.0768l0.18434-1.0907h1.0753v8.3721q0 1.7666-0.90634 2.6576-0.89098 0.89098-2.7805 0.89098-1.8127 0-2.9648-0.5223v-1.2443q1.2136 0.6452 3.0416 0.6452 1.06 0 1.6591-0.62983 0.61447-0.61447 0.61447-1.6898v-0.3226q0-0.18434 0.0154-0.52229 0.0154-0.35332 0.0307-0.49158h-0.0615q-0.82953 1.2443-2.55 1.2443-1.5976 0-2.504-1.1214-0.89098-1.1214-0.89098-3.1338 0-1.9663 0.89098-3.1184 0.90634-1.1675 2.4886-1.1675zm0.18434 1.1368q-1.0292 0-1.5976 0.82953-0.56838 0.81417-0.56838 2.335t0.55302 2.335q0.55302 0.79881 1.6437 0.79881 1.2443 0 1.8127-0.66056 0.56838-0.67591 0.56838-2.166v-0.32259q0-1.6744-0.58374-2.4118-0.58375-0.73736-1.828-0.73736z"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Qt Advanced ">
-   <path d="m100.61 89.668q0 2.0124-0.81417 3.441-0.79881 1.4133-2.3811 1.9356l2.6269 2.7344h-1.9817l-2.1199-2.4732q-0.09217 0-0.1997 0-0.09217 0.01536-0.18434 0.01536-1.7051 0-2.8419-0.70664-1.1214-0.70664-1.6744-1.9817-0.55302-1.275-0.55302-2.9802 0-1.6744 0.55302-2.9341 0.55302-1.275 1.6744-1.9817 1.1368-0.70664 2.8573-0.70664 1.6437 0 2.7651 0.70664 1.1214 0.69128 1.6898 1.9663 0.58374 1.2597 0.58374 2.9648zm-8.664 0q0 2.0738 0.87562 3.272 0.87562 1.1829 2.7344 1.1829 1.8588 0 2.719-1.1829 0.87562-1.1982 0.87562-3.272 0-2.0738-0.86026-3.2413-0.86026-1.1829-2.719-1.1829-1.8741 0-2.7497 1.1829-0.87562 1.1675-0.87562 3.2413z"/>
-   <path d="m105.6 94.215q0.30723 0 0.62983-0.04609 0.32259-0.04609 0.52229-0.12289v1.0292q-0.21506 0.10753-0.61446 0.16898-0.39941 0.07681-0.76809 0.07681-0.64519 0-1.1982-0.21506-0.53766-0.23042-0.87562-0.78345-0.33796-0.55302-0.33796-1.5515v-4.7929h-1.1675v-0.64519l1.1829-0.53766 0.53766-1.7512h0.7988v1.8895h2.3811v1.0446h-2.3811v4.7621q0 0.75272 0.35332 1.1214 0.36868 0.35332 0.93707 0.35332z"/>
-   <path d="m119.46 95.168-1.3211-3.3949h-4.3474l-1.3058 3.3949h-1.3979l4.2859-11.014h1.2443l4.2706 11.014zm-1.7359-4.6239-1.2289-3.3181q-0.0461-0.12289-0.15362-0.44549-0.10753-0.3226-0.21507-0.66055-0.0922-0.35332-0.15361-0.53766-0.1229 0.47621-0.26115 0.93706-0.12289 0.44549-0.21507 0.70664l-1.2443 3.3181z"/>
-   <path d="m125.13 95.321q-1.5362 0-2.4579-1.06-0.9217-1.0753-0.9217-3.1952t0.9217-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98314 0.89098-0.61447 0.36868-1.5823 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50694-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-   <path d="m133.47 95.168-3.1184-8.2339h1.444l1.7512 4.8543q0.12289 0.33796 0.26115 0.75272 0.13825 0.41477 0.24579 0.79881 0.10753 0.38404 0.15361 0.62983h0.0615q0.0461-0.24579 0.16898-0.62983 0.12289-0.3994 0.26115-0.79881 0.13825-0.41477 0.26115-0.75272l1.7512-4.8543h1.444l-3.1338 8.2339z"/>
-   <path d="m142.58 86.796q1.5054 0 2.2274 0.66055 0.722 0.66055 0.722 2.1046v5.607h-0.98315l-0.26115-1.1675h-0.0615q-0.53766 0.67591-1.1368 0.99851-0.59911 0.3226-1.6283 0.3226-1.1214 0-1.8588-0.58374-0.73736-0.59911-0.73736-1.8588 0-1.2289 0.96778-1.8895 0.96779-0.67591 2.9802-0.73736l1.3979-0.04609v-0.49158q0-1.0292-0.44549-1.4286t-1.2597-0.3994q-0.64519 0-1.2289 0.1997-0.58374 0.18434-1.0907 0.43013l-0.41476-1.0139q0.53766-0.29187 1.275-0.49158 0.73736-0.21506 1.5362-0.21506zm1.613 4.3474-1.2136 0.04609q-1.5362 0.06145-2.1353 0.49157-0.58375 0.43013-0.58375 1.2136 0 0.69128 0.41477 1.0139 0.43013 0.3226 1.0907 0.3226 1.0292 0 1.7205-0.56838 0.70664-0.58374 0.70664-1.782z"/>
-   <path d="m152.04 86.78q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808t-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95243 0.70663-0.3226 1.4901-0.3226z"/>
-   <path d="m160.87 95.321q-1.106 0-1.9509-0.44549-0.8449-0.44549-1.3365-1.3826-0.47622-0.93706-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50694-0.95243 1.3826-1.3979 0.87562-0.44549 1.9817-0.44549 0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41476 1.1214q-0.36869-0.13826-0.86026-0.26115-0.49157-0.12289-0.9217-0.12289-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13826 0.95243-0.33796v1.1982q-0.41477 0.21506-0.92171 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m168.13 86.78q1.0446 0 1.8127 0.46085 0.76809 0.46085 1.1675 1.3057 0.41477 0.82953 0.41477 1.9509v0.81417h-5.6378q0.0307 1.3979 0.70664 2.1353 0.69128 0.722 1.9202 0.722 0.78345 0 1.3826-0.13826 0.61447-0.15362 1.2597-0.43013v1.1829q-0.62983 0.27651-1.2443 0.3994-0.61447 0.13826-1.4594 0.13826-1.1828 0-2.0738-0.47621t-1.3979-1.4133q-0.49157-0.93706-0.49157-2.3196 0-1.3518 0.44549-2.3196 0.46085-0.96779 1.275-1.4901 0.82953-0.5223 1.9202-0.5223zm-0.0154 1.106q-0.96779 0-1.5362 0.62983-0.55302 0.61447-0.66055 1.7205h4.1937q-0.0154-1.0446-0.49157-1.6898-0.47622-0.66055-1.5054-0.66055z"/>
-   <path d="m176.53 95.321q-1.5362 0-2.4579-1.06-0.92171-1.0753-0.92171-3.1952t0.92171-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98315 0.89098-0.61446 0.36868-1.5822 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50693-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-  </g>
- </g>
-</svg>
--- a/demo/images/ads_tile_blue_light.svg
+++ b/demo/images/ads_tile_blue_light.svg
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="1024"
-   height="1024"
-   viewBox="0 0 270.93333 270.93333"
-   version="1.1"
-   id="svg506"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
-   sodipodi:docname="ads_tile_blue_light.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview508"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="0.77111176"
-     inkscape:cx="450.64804"
-     inkscape:cy="534.2935"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs503" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="path16513"
-       style="mix-blend-mode:normal;fill:#009ddd;fill-opacity:1;fill-rule:nonzero;stroke-width:0.264583"
-       d="M -2.5e-6,-2.5e-6 V 270.93333 H 270.93333 V -2.5e-6 Z" />
-    <g
-       id="g1224"
-       transform="matrix(0.12402399,0,0,0.12402399,71.967002,73.673805)"
-       style="fill:#ffffff;fill-opacity:0.25;stroke-width:2.13332">
-      <path
-         id="path927"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="m 405.32995,234.66 v 256 h 469.3301 v -256 z" />
-      <path
-         id="path16513-9"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="M 661.32995,533.3299 V 789.32994 H 874.66003 V 533.3299 Z" />
-      <path
-         id="path16513-5"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="m 405.32995,533.33 v 256 h 213.33008 v -256 z" />
-      <path
-         id="path24788"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="M 149.32995,234.66 V 789.32994 H 362.66003 V 234.66 Z" />
-    </g>
-    <g
-       aria-label="Docking"
-       id="text2150"
-       style="font-size:15.3617px;line-height:1.05;fill:#ffffff;stroke-width:0.264583;fill-opacity:0.25">
-      <path
-         d="m 100.07327,182.94499 q 0,2.78047 -1.520805,4.19375 -1.505447,1.39791 -4.209106,1.39791 H 91.286381 V 177.5684 h 3.379574 q 1.643702,0 2.857276,0.61447 1.228936,0.61446 1.889489,1.81268 0.66055,1.19821 0.66055,2.94944 z m -1.459358,0.0461 q 0,-2.19673 -1.090681,-3.2106 -1.075319,-1.02923 -3.056978,-1.02923 h -1.797319 v 8.60255 h 1.490085 q 4.454893,0 4.454893,-4.36272 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2539" />
-      <path
-         d="m 114.83588,184.40435 q 0,2.04311 -1.0446,3.16451 -1.02923,1.12141 -2.79583,1.12141 -1.09068,0 -1.95094,-0.49158 -0.84489,-0.50693 -1.33646,-1.45936 -0.49158,-0.96778 -0.49158,-2.33498 0,-2.0431 1.01387,-3.14914 1.02924,-1.10605 2.8112,-1.10605 1.10604,0 1.96629,0.50694 0.86026,0.49157 1.33647,1.444 0.49158,0.93706 0.49158,2.30425 z m -6.22149,0 q 0,1.45937 0.56838,2.31962 0.58374,0.84489 1.8434,0.84489 1.2443,0 1.82805,-0.84489 0.58374,-0.86025 0.58374,-2.31962 0,-1.45936 -0.58374,-2.28889 -0.58375,-0.82953 -1.84341,-0.82953 -1.25966,0 -1.82804,0.82953 -0.56838,0.82953 -0.56838,2.28889 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2541" />
-      <path
-         d="m 125.63516,188.69027 q -1.10604,0 -1.95094,-0.44549 -0.84489,-0.44549 -1.33646,-1.38255 -0.47622,-0.93707 -0.47622,-2.39643 0,-1.52081 0.49158,-2.47323 0.50693,-0.95243 1.38255,-1.39792 0.87562,-0.44549 1.98166,-0.44549 0.61447,0 1.19821,0.13826 0.59911,0.12289 0.96779,0.30723 l -0.41477,1.12141 q -0.36868,-0.13826 -0.86025,-0.26115 -0.49158,-0.1229 -0.9217,-0.1229 -2.42715,0 -2.42715,3.11843 0,1.49008 0.58374,2.28889 0.59911,0.78345 1.7666,0.78345 0.66055,0 1.18285,-0.13826 0.5223,-0.13825 0.95242,-0.33795 v 1.19821 q -0.41476,0.21506 -0.9217,0.3226 -0.49157,0.12289 -1.19821,0.12289 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2543" />
-      <path
-         d="m 136.40372,176.86176 v 6.09859 q 0,0.24579 -0.0307,0.6452 -0.0154,0.3994 -0.0307,0.69127 h 0.0614 q 0.0922,-0.12289 0.27651,-0.35332 0.18434,-0.23042 0.36868,-0.46085 0.19971,-0.24578 0.33796,-0.3994 l 2.62685,-2.78047 h 1.58226 l -3.33349,3.51783 3.56391,4.71604 h -1.62834 l -2.85727,-3.84042 -0.93707,0.81417 v 3.02625 h -1.33647 v -11.67489 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2545" />
-      <path
-         d="m 149.32293,177.21508 q 0.30724,0 0.53766,0.21506 0.24579,0.1997 0.24579,0.64519 0,0.44549 -0.24579,0.66056 -0.23042,0.1997 -0.53766,0.1997 -0.33795,0 -0.56838,-0.1997 -0.23042,-0.21507 -0.23042,-0.66056 0,-0.44549 0.23042,-0.64519 0.23043,-0.21506 0.56838,-0.21506 z m 0.66056,3.0877 v 8.23387 h -1.35183 v -8.23387 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2547" />
-      <path
-         d="m 161.91954,180.14916 q 1.47472,0 2.22745,0.722 0.75272,0.722 0.75272,2.30426 v 5.36123 h -1.33647 v -5.26906 q 0,-1.98166 -1.8434,-1.98166 -1.36719,0 -1.88949,0.76808 -0.5223,0.76809 -0.5223,2.21209 v 4.27055 h -1.35183 v -8.23387 h 1.09068 l 0.1997,1.1214 h 0.0768 q 0.39941,-0.64519 1.10604,-0.95242 0.70664,-0.3226 1.49009,-0.3226 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2549" />
-      <path
-         d="m 175.72973,180.14916 q 0.81417,0 1.45936,0.30724 0.66055,0.30723 1.1214,0.93706 h 0.0768 l 0.18434,-1.09068 h 1.07532 v 8.37213 q 0,1.76659 -0.90634,2.65757 -0.89098,0.89098 -2.78047,0.89098 -1.81268,0 -2.96481,-0.5223 v -1.2443 q 1.21358,0.6452 3.04162,0.6452 1.05996,0 1.65906,-0.62983 0.61447,-0.61447 0.61447,-1.68979 v -0.3226 q 0,-0.18434 0.0154,-0.52229 0.0154,-0.35332 0.0307,-0.49158 h -0.0615 q -0.82953,1.2443 -2.55004,1.2443 -1.59762,0 -2.50396,-1.12141 -0.89098,-1.1214 -0.89098,-3.13378 0,-1.9663 0.89098,-3.11843 0.90634,-1.16749 2.4886,-1.16749 z m 0.18434,1.13677 q -1.02924,0 -1.59762,0.82953 -0.56838,0.81417 -0.56838,2.33498 0,1.52081 0.55302,2.33498 0.55302,0.79881 1.6437,0.79881 1.2443,0 1.81268,-0.66056 0.56838,-0.67591 0.56838,-2.166 v -0.32259 q 0,-1.67443 -0.58374,-2.41179 -0.58375,-0.73736 -1.82804,-0.73736 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2551" />
-    </g>
-    <g
-       aria-label="Qt Advanced
-"
-       id="text2150-1"
-       style="font-size:15.3617px;line-height:1.05;fill:#ffffff;stroke-width:0.264583;fill-opacity:0.25">
-      <path
-         d="m 100.61097,89.66819 q 0,2.012383 -0.814169,3.441021 -0.798808,1.413276 -2.381063,1.935574 l 2.626852,2.734383 h -1.981661 l -2.119914,-2.473234 q -0.09217,0 -0.199702,0 -0.09217,0.01536 -0.184341,0.01536 -1.705148,0 -2.841914,-0.706638 -1.121404,-0.706639 -1.674426,-1.98166 -0.553021,-1.275021 -0.553021,-2.980169 0,-1.674426 0.553021,-2.934085 0.553022,-1.275021 1.674426,-1.98166 1.136766,-0.706638 2.857276,-0.706638 1.643702,0 2.765106,0.706638 1.121404,0.691277 1.68979,1.966298 0.58374,1.25966 0.58374,2.964808 z m -8.663997,0 q 0,2.07383 0.875617,3.272042 0.875617,1.182851 2.734382,1.182851 1.858766,0 2.719021,-1.182851 0.875617,-1.198212 0.875617,-3.272042 0,-2.073829 -0.860255,-3.241318 -0.860255,-1.182851 -2.719021,-1.182851 -1.874127,0 -2.749744,1.182851 -0.875617,1.167489 -0.875617,3.241318 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2518" />
-      <path
-         d="m 105.60353,94.215253 q 0.30723,0 0.62983,-0.04609 0.32259,-0.04609 0.52229,-0.122893 v 1.029234 q -0.21506,0.107532 -0.61446,0.168978 -0.39941,0.07681 -0.76809,0.07681 -0.64519,0 -1.19821,-0.215064 -0.53766,-0.230425 -0.87562,-0.783447 -0.33796,-0.553021 -0.33796,-1.551531 v -4.792851 h -1.16749 v -0.645191 l 1.18286,-0.53766 0.53766,-1.751234 h 0.7988 v 1.88949 h 2.38107 v 1.044595 h -2.38107 v 4.762127 q 0,0.752724 0.35332,1.121404 0.36868,0.353319 0.93707,0.353319 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2520" />
-      <path
-         d="m 119.45978,95.167679 -1.3211,-3.394936 h -4.34736 l -1.30575,3.394936 h -1.39791 l 4.28591,-11.014339 h 1.2443 l 4.27055,11.014339 z m -1.73587,-4.623872 -1.22893,-3.318127 q -0.0461,-0.122894 -0.15362,-0.445489 -0.10753,-0.322596 -0.21507,-0.660554 -0.0922,-0.353319 -0.15361,-0.537659 -0.1229,0.476213 -0.26115,0.937064 -0.12289,0.445489 -0.21507,0.706638 l -1.24429,3.318127 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2522" />
-      <path
-         d="m 125.12825,95.321296 q -1.53617,0 -2.45787,-1.059957 -0.9217,-1.075319 -0.9217,-3.195234 0,-2.119915 0.9217,-3.195234 0.93706,-1.09068 2.47323,-1.09068 0.95243,0 1.55153,0.353319 0.61447,0.353319 0.99851,0.860255 h 0.0922 q -0.0307,-0.199702 -0.0614,-0.583745 -0.0307,-0.399404 -0.0307,-0.629829 v -3.287404 h 1.35183 v 11.674892 h -1.09068 l -0.1997,-1.106043 h -0.0614 q -0.36868,0.522298 -0.98314,0.890979 -0.61447,0.368681 -1.58226,0.368681 z m 0.21506,-1.121404 q 1.30575,0 1.82805,-0.706638 0.53766,-0.722 0.53766,-2.166 v -0.245787 q 0,-1.53617 -0.50694,-2.35034 -0.50694,-0.829532 -1.87413,-0.829532 -1.09068,0 -1.6437,0.875617 -0.53766,0.860255 -0.53766,2.319616 0,1.474724 0.53766,2.288894 0.55302,0.81417 1.65906,0.81417 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2524" />
-      <path
-         d="m 133.46965,95.167679 -3.11842,-8.233871 h 1.444 l 1.75123,4.854297 q 0.12289,0.337957 0.26115,0.752723 0.13825,0.414766 0.24579,0.798809 0.10753,0.384042 0.15361,0.629829 h 0.0615 q 0.0461,-0.245787 0.16898,-0.629829 0.12289,-0.399405 0.26115,-0.798809 0.13825,-0.414766 0.26115,-0.752723 l 1.75123,-4.854297 h 1.444 l -3.13379,8.233871 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2526" />
-      <path
-         d="m 142.57913,86.795552 q 1.50545,0 2.22745,0.660553 0.722,0.660554 0.722,2.104553 v 5.607021 h -0.98315 l -0.26115,-1.167489 h -0.0615 q -0.53766,0.675914 -1.13676,0.99851 -0.59911,0.322596 -1.62834,0.322596 -1.12141,0 -1.85877,-0.583745 -0.73736,-0.599106 -0.73736,-1.858765 0,-1.228936 0.96778,-1.88949 0.96779,-0.675914 2.98017,-0.737361 l 1.39792,-0.04609 V 89.71427 q 0,-1.029234 -0.44549,-1.428638 -0.44549,-0.399404 -1.25966,-0.399404 -0.64519,0 -1.22894,0.199702 -0.58374,0.184341 -1.09068,0.430128 l -0.41476,-1.013872 q 0.53766,-0.291873 1.27502,-0.491575 0.73736,-0.215064 1.53617,-0.215064 z m 1.61298,4.347361 -1.21358,0.04609 q -1.53617,0.06145 -2.13527,0.491574 -0.58375,0.430128 -0.58375,1.213574 0,0.691277 0.41477,1.013872 0.43013,0.322596 1.09068,0.322596 1.02923,0 1.72051,-0.568383 0.70664,-0.583744 0.70664,-1.781957 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2528" />
-      <path
-         d="m 152.04195,86.780191 q 1.47472,0 2.22745,0.722 0.75272,0.721999 0.75272,2.304255 v 5.361233 h -1.33647 v -5.269063 q 0,-1.98166 -1.8434,-1.98166 -1.36719,0 -1.88949,0.768085 -0.5223,0.768085 -0.5223,2.212085 v 4.270553 h -1.35183 v -8.233871 h 1.09068 l 0.1997,1.121404 h 0.0768 q 0.39941,-0.645192 1.10605,-0.952426 0.70663,-0.322595 1.49008,-0.322595 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2530" />
-      <path
-         d="m 160.87493,95.321296 q -1.10604,0 -1.95093,-0.445489 -0.8449,-0.44549 -1.33647,-1.382553 -0.47622,-0.937064 -0.47622,-2.396426 0,-1.520808 0.49158,-2.473233 0.50694,-0.952426 1.38255,-1.397915 0.87562,-0.445489 1.98166,-0.445489 0.61447,0 1.19821,0.138255 0.59911,0.122894 0.96779,0.307234 l -0.41476,1.121404 q -0.36869,-0.138255 -0.86026,-0.261149 -0.49157,-0.122893 -0.9217,-0.122893 -2.42715,0 -2.42715,3.118425 0,1.490085 0.58374,2.288893 0.59911,0.783447 1.7666,0.783447 0.66055,0 1.18285,-0.138256 0.5223,-0.138255 0.95243,-0.337957 v 1.198213 q -0.41477,0.215063 -0.92171,0.322595 -0.49157,0.122894 -1.19821,0.122894 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2532" />
-      <path
-         d="m 168.12564,86.780191 q 1.0446,0 1.81268,0.460851 0.76809,0.460851 1.16749,1.305744 0.41477,0.829532 0.41477,1.950936 v 0.81417 h -5.63775 q 0.0307,1.397915 0.70664,2.135276 0.69128,0.722 1.92021,0.722 0.78345,0 1.38256,-0.138255 0.61447,-0.153617 1.25966,-0.430128 v 1.182851 q -0.62983,0.276511 -1.2443,0.399405 -0.61447,0.138255 -1.45936,0.138255 -1.18285,0 -2.07383,-0.476213 -0.89098,-0.476213 -1.39792,-1.413276 -0.49157,-0.937064 -0.49157,-2.319617 0,-1.35183 0.44549,-2.319617 0.46085,-0.967787 1.27502,-1.490085 0.82953,-0.522297 1.92021,-0.522297 z m -0.0154,1.106042 q -0.96779,0 -1.53617,0.62983 -0.55302,0.614468 -0.66055,1.72051 h 4.19374 q -0.0154,-1.044595 -0.49157,-1.689787 -0.47622,-0.660553 -1.50545,-0.660553 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2534" />
-      <path
-         d="m 176.52848,95.321296 q -1.53617,0 -2.45787,-1.059957 -0.92171,-1.075319 -0.92171,-3.195234 0,-2.119915 0.92171,-3.195234 0.93706,-1.09068 2.47323,-1.09068 0.95243,0 1.55153,0.353319 0.61447,0.353319 0.99851,0.860255 h 0.0922 q -0.0307,-0.199702 -0.0614,-0.583745 -0.0307,-0.399404 -0.0307,-0.629829 v -3.287404 h 1.35183 v 11.674892 h -1.09068 l -0.1997,-1.106043 h -0.0614 q -0.36868,0.522298 -0.98315,0.890979 -0.61446,0.368681 -1.58225,0.368681 z m 0.21506,-1.121404 q 1.30575,0 1.82804,-0.706638 0.53766,-0.722 0.53766,-2.166 v -0.245787 q 0,-1.53617 -0.50693,-2.35034 -0.50694,-0.829532 -1.87413,-0.829532 -1.09068,0 -1.6437,0.875617 -0.53766,0.860255 -0.53766,2.319616 0,1.474724 0.53766,2.288894 0.55302,0.81417 1.65906,0.81417 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2536" />
-    </g>
-  </g>
-</svg>
--- a/demo/images/ads_tile_green.svg
+++ b/demo/images/ads_tile_green.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 270.93 270.93" xmlns="http://www.w3.org/2000/svg">
- <path d="m-2.5e-6 -2.5e-6v270.93h270.93v-270.93z" fill="#accb01" stroke-width=".26458" style="mix-blend-mode:normal"/>
- <g fill="#fff" fill-opacity=".25">
-  <g transform="matrix(.12402 0 0 .12402 71.967 73.674)" stroke-width="4.7887">
-   <path d="m405.33 234.66v256h469.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m661.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m405.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m149.33 234.66v554.67h213.33v-554.67z" style="mix-blend-mode:normal"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Docking">
-   <path d="m100.07 182.94q0 2.7805-1.5208 4.1938-1.5054 1.3979-4.2091 1.3979h-3.057v-10.968h3.3796q1.6437 0 2.8573 0.61447 1.2289 0.61446 1.8895 1.8127 0.66055 1.1982 0.66055 2.9494zm-1.4594 0.0461q0-2.1967-1.0907-3.2106-1.0753-1.0292-3.057-1.0292h-1.7973v8.6026h1.4901q4.4549 0 4.4549-4.3627z"/>
-   <path d="m114.84 184.4q0 2.0431-1.0446 3.1645-1.0292 1.1214-2.7958 1.1214-1.0907 0-1.9509-0.49158-0.84489-0.50693-1.3365-1.4594-0.49158-0.96778-0.49158-2.335 0-2.0431 1.0139-3.1491 1.0292-1.106 2.8112-1.106 1.106 0 1.9663 0.50694 0.86026 0.49157 1.3365 1.444 0.49158 0.93706 0.49158 2.3042zm-6.2215 0q0 1.4594 0.56838 2.3196 0.58374 0.84489 1.8434 0.84489 1.2443 0 1.828-0.84489 0.58374-0.86025 0.58374-2.3196 0-1.4594-0.58374-2.2889-0.58375-0.82953-1.8434-0.82953t-1.828 0.82953-0.56838 2.2889z"/>
-   <path d="m125.64 188.69q-1.106 0-1.9509-0.44549-0.84489-0.44549-1.3365-1.3826-0.47622-0.93707-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50693-0.95243 1.3826-1.3979t1.9817-0.44549q0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41477 1.1214q-0.36868-0.13826-0.86025-0.26115-0.49158-0.1229-0.9217-0.1229-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13825 0.95242-0.33795v1.1982q-0.41476 0.21506-0.9217 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m136.4 176.86v6.0986q0 0.24579-0.0307 0.6452-0.0154 0.3994-0.0307 0.69127h0.0614q0.0922-0.12289 0.27651-0.35332 0.18434-0.23042 0.36868-0.46085 0.19971-0.24578 0.33796-0.3994l2.6268-2.7805h1.5823l-3.3335 3.5178 3.5639 4.716h-1.6283l-2.8573-3.8404-0.93707 0.81417v3.0262h-1.3365v-11.675z"/>
-   <path d="m149.32 177.22q0.30724 0 0.53766 0.21506 0.24579 0.1997 0.24579 0.64519t-0.24579 0.66056q-0.23042 0.1997-0.53766 0.1997-0.33795 0-0.56838-0.1997-0.23042-0.21507-0.23042-0.66056t0.23042-0.64519q0.23043-0.21506 0.56838-0.21506zm0.66056 3.0877v8.2339h-1.3518v-8.2339z"/>
-   <path d="m161.92 180.15q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808-0.5223 0.76809-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95242 0.70664-0.3226 1.4901-0.3226z"/>
-   <path d="m175.73 180.15q0.81417 0 1.4594 0.30724 0.66055 0.30723 1.1214 0.93706h0.0768l0.18434-1.0907h1.0753v8.3721q0 1.7666-0.90634 2.6576-0.89098 0.89098-2.7805 0.89098-1.8127 0-2.9648-0.5223v-1.2443q1.2136 0.6452 3.0416 0.6452 1.06 0 1.6591-0.62983 0.61447-0.61447 0.61447-1.6898v-0.3226q0-0.18434 0.0154-0.52229 0.0154-0.35332 0.0307-0.49158h-0.0615q-0.82953 1.2443-2.55 1.2443-1.5976 0-2.504-1.1214-0.89098-1.1214-0.89098-3.1338 0-1.9663 0.89098-3.1184 0.90634-1.1675 2.4886-1.1675zm0.18434 1.1368q-1.0292 0-1.5976 0.82953-0.56838 0.81417-0.56838 2.335t0.55302 2.335q0.55302 0.79881 1.6437 0.79881 1.2443 0 1.8127-0.66056 0.56838-0.67591 0.56838-2.166v-0.32259q0-1.6744-0.58374-2.4118-0.58375-0.73736-1.828-0.73736z"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Qt Advanced ">
-   <path d="m100.61 89.668q0 2.0124-0.81417 3.441-0.79881 1.4133-2.3811 1.9356l2.6269 2.7344h-1.9817l-2.1199-2.4732q-0.09217 0-0.1997 0-0.09217 0.01536-0.18434 0.01536-1.7051 0-2.8419-0.70664-1.1214-0.70664-1.6744-1.9817-0.55302-1.275-0.55302-2.9802 0-1.6744 0.55302-2.9341 0.55302-1.275 1.6744-1.9817 1.1368-0.70664 2.8573-0.70664 1.6437 0 2.7651 0.70664 1.1214 0.69128 1.6898 1.9663 0.58374 1.2597 0.58374 2.9648zm-8.664 0q0 2.0738 0.87562 3.272 0.87562 1.1829 2.7344 1.1829 1.8588 0 2.719-1.1829 0.87562-1.1982 0.87562-3.272 0-2.0738-0.86026-3.2413-0.86026-1.1829-2.719-1.1829-1.8741 0-2.7497 1.1829-0.87562 1.1675-0.87562 3.2413z"/>
-   <path d="m105.6 94.215q0.30723 0 0.62983-0.04609 0.32259-0.04609 0.52229-0.12289v1.0292q-0.21506 0.10753-0.61446 0.16898-0.39941 0.07681-0.76809 0.07681-0.64519 0-1.1982-0.21506-0.53766-0.23042-0.87562-0.78345-0.33796-0.55302-0.33796-1.5515v-4.7929h-1.1675v-0.64519l1.1829-0.53766 0.53766-1.7512h0.7988v1.8895h2.3811v1.0446h-2.3811v4.7621q0 0.75272 0.35332 1.1214 0.36868 0.35332 0.93707 0.35332z"/>
-   <path d="m119.46 95.168-1.3211-3.3949h-4.3474l-1.3058 3.3949h-1.3979l4.2859-11.014h1.2443l4.2706 11.014zm-1.7359-4.6239-1.2289-3.3181q-0.0461-0.12289-0.15362-0.44549-0.10753-0.3226-0.21507-0.66055-0.0922-0.35332-0.15361-0.53766-0.1229 0.47621-0.26115 0.93706-0.12289 0.44549-0.21507 0.70664l-1.2443 3.3181z"/>
-   <path d="m125.13 95.321q-1.5362 0-2.4579-1.06-0.9217-1.0753-0.9217-3.1952t0.9217-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98314 0.89098-0.61447 0.36868-1.5823 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50694-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-   <path d="m133.47 95.168-3.1184-8.2339h1.444l1.7512 4.8543q0.12289 0.33796 0.26115 0.75272 0.13825 0.41477 0.24579 0.79881 0.10753 0.38404 0.15361 0.62983h0.0615q0.0461-0.24579 0.16898-0.62983 0.12289-0.3994 0.26115-0.79881 0.13825-0.41477 0.26115-0.75272l1.7512-4.8543h1.444l-3.1338 8.2339z"/>
-   <path d="m142.58 86.796q1.5054 0 2.2274 0.66055 0.722 0.66055 0.722 2.1046v5.607h-0.98315l-0.26115-1.1675h-0.0615q-0.53766 0.67591-1.1368 0.99851-0.59911 0.3226-1.6283 0.3226-1.1214 0-1.8588-0.58374-0.73736-0.59911-0.73736-1.8588 0-1.2289 0.96778-1.8895 0.96779-0.67591 2.9802-0.73736l1.3979-0.04609v-0.49158q0-1.0292-0.44549-1.4286t-1.2597-0.3994q-0.64519 0-1.2289 0.1997-0.58374 0.18434-1.0907 0.43013l-0.41476-1.0139q0.53766-0.29187 1.275-0.49158 0.73736-0.21506 1.5362-0.21506zm1.613 4.3474-1.2136 0.04609q-1.5362 0.06145-2.1353 0.49157-0.58375 0.43013-0.58375 1.2136 0 0.69128 0.41477 1.0139 0.43013 0.3226 1.0907 0.3226 1.0292 0 1.7205-0.56838 0.70664-0.58374 0.70664-1.782z"/>
-   <path d="m152.04 86.78q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808t-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95243 0.70663-0.3226 1.4901-0.3226z"/>
-   <path d="m160.87 95.321q-1.106 0-1.9509-0.44549-0.8449-0.44549-1.3365-1.3826-0.47622-0.93706-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50694-0.95243 1.3826-1.3979 0.87562-0.44549 1.9817-0.44549 0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41476 1.1214q-0.36869-0.13826-0.86026-0.26115-0.49157-0.12289-0.9217-0.12289-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13826 0.95243-0.33796v1.1982q-0.41477 0.21506-0.92171 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m168.13 86.78q1.0446 0 1.8127 0.46085 0.76809 0.46085 1.1675 1.3057 0.41477 0.82953 0.41477 1.9509v0.81417h-5.6378q0.0307 1.3979 0.70664 2.1353 0.69128 0.722 1.9202 0.722 0.78345 0 1.3826-0.13826 0.61447-0.15362 1.2597-0.43013v1.1829q-0.62983 0.27651-1.2443 0.3994-0.61447 0.13826-1.4594 0.13826-1.1828 0-2.0738-0.47621t-1.3979-1.4133q-0.49157-0.93706-0.49157-2.3196 0-1.3518 0.44549-2.3196 0.46085-0.96779 1.275-1.4901 0.82953-0.5223 1.9202-0.5223zm-0.0154 1.106q-0.96779 0-1.5362 0.62983-0.55302 0.61447-0.66055 1.7205h4.1937q-0.0154-1.0446-0.49157-1.6898-0.47622-0.66055-1.5054-0.66055z"/>
-   <path d="m176.53 95.321q-1.5362 0-2.4579-1.06-0.92171-1.0753-0.92171-3.1952t0.92171-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98315 0.89098-0.61446 0.36868-1.5822 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50693-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-  </g>
- </g>
-</svg>
--- a/demo/images/ads_tile_orange.svg
+++ b/demo/images/ads_tile_orange.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 270.93 270.93" xmlns="http://www.w3.org/2000/svg">
- <path d="m-2.5e-6 -2.5e-6v270.93h270.93v-270.93z" fill="#ff9833" stroke-width=".26458" style="mix-blend-mode:normal"/>
- <g fill="#fff" fill-opacity=".25">
-  <g transform="matrix(.12402 0 0 .12402 71.967 73.674)" stroke-width="4.7887">
-   <path d="m405.33 234.66v256h469.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m661.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m405.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m149.33 234.66v554.67h213.33v-554.67z" style="mix-blend-mode:normal"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Docking">
-   <path d="m100.07 182.94q0 2.7805-1.5208 4.1938-1.5054 1.3979-4.2091 1.3979h-3.057v-10.968h3.3796q1.6437 0 2.8573 0.61447 1.2289 0.61446 1.8895 1.8127 0.66055 1.1982 0.66055 2.9494zm-1.4594 0.0461q0-2.1967-1.0907-3.2106-1.0753-1.0292-3.057-1.0292h-1.7973v8.6026h1.4901q4.4549 0 4.4549-4.3627z"/>
-   <path d="m114.84 184.4q0 2.0431-1.0446 3.1645-1.0292 1.1214-2.7958 1.1214-1.0907 0-1.9509-0.49158-0.84489-0.50693-1.3365-1.4594-0.49158-0.96778-0.49158-2.335 0-2.0431 1.0139-3.1491 1.0292-1.106 2.8112-1.106 1.106 0 1.9663 0.50694 0.86026 0.49157 1.3365 1.444 0.49158 0.93706 0.49158 2.3042zm-6.2215 0q0 1.4594 0.56838 2.3196 0.58374 0.84489 1.8434 0.84489 1.2443 0 1.828-0.84489 0.58374-0.86025 0.58374-2.3196 0-1.4594-0.58374-2.2889-0.58375-0.82953-1.8434-0.82953t-1.828 0.82953-0.56838 2.2889z"/>
-   <path d="m125.64 188.69q-1.106 0-1.9509-0.44549-0.84489-0.44549-1.3365-1.3826-0.47622-0.93707-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50693-0.95243 1.3826-1.3979t1.9817-0.44549q0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41477 1.1214q-0.36868-0.13826-0.86025-0.26115-0.49158-0.1229-0.9217-0.1229-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13825 0.95242-0.33795v1.1982q-0.41476 0.21506-0.9217 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m136.4 176.86v6.0986q0 0.24579-0.0307 0.6452-0.0154 0.3994-0.0307 0.69127h0.0614q0.0922-0.12289 0.27651-0.35332 0.18434-0.23042 0.36868-0.46085 0.19971-0.24578 0.33796-0.3994l2.6268-2.7805h1.5823l-3.3335 3.5178 3.5639 4.716h-1.6283l-2.8573-3.8404-0.93707 0.81417v3.0262h-1.3365v-11.675z"/>
-   <path d="m149.32 177.22q0.30724 0 0.53766 0.21506 0.24579 0.1997 0.24579 0.64519t-0.24579 0.66056q-0.23042 0.1997-0.53766 0.1997-0.33795 0-0.56838-0.1997-0.23042-0.21507-0.23042-0.66056t0.23042-0.64519q0.23043-0.21506 0.56838-0.21506zm0.66056 3.0877v8.2339h-1.3518v-8.2339z"/>
-   <path d="m161.92 180.15q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808-0.5223 0.76809-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95242 0.70664-0.3226 1.4901-0.3226z"/>
-   <path d="m175.73 180.15q0.81417 0 1.4594 0.30724 0.66055 0.30723 1.1214 0.93706h0.0768l0.18434-1.0907h1.0753v8.3721q0 1.7666-0.90634 2.6576-0.89098 0.89098-2.7805 0.89098-1.8127 0-2.9648-0.5223v-1.2443q1.2136 0.6452 3.0416 0.6452 1.06 0 1.6591-0.62983 0.61447-0.61447 0.61447-1.6898v-0.3226q0-0.18434 0.0154-0.52229 0.0154-0.35332 0.0307-0.49158h-0.0615q-0.82953 1.2443-2.55 1.2443-1.5976 0-2.504-1.1214-0.89098-1.1214-0.89098-3.1338 0-1.9663 0.89098-3.1184 0.90634-1.1675 2.4886-1.1675zm0.18434 1.1368q-1.0292 0-1.5976 0.82953-0.56838 0.81417-0.56838 2.335t0.55302 2.335q0.55302 0.79881 1.6437 0.79881 1.2443 0 1.8127-0.66056 0.56838-0.67591 0.56838-2.166v-0.32259q0-1.6744-0.58374-2.4118-0.58375-0.73736-1.828-0.73736z"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Qt Advanced ">
-   <path d="m100.61 89.668q0 2.0124-0.81417 3.441-0.79881 1.4133-2.3811 1.9356l2.6269 2.7344h-1.9817l-2.1199-2.4732q-0.09217 0-0.1997 0-0.09217 0.01536-0.18434 0.01536-1.7051 0-2.8419-0.70664-1.1214-0.70664-1.6744-1.9817-0.55302-1.275-0.55302-2.9802 0-1.6744 0.55302-2.9341 0.55302-1.275 1.6744-1.9817 1.1368-0.70664 2.8573-0.70664 1.6437 0 2.7651 0.70664 1.1214 0.69128 1.6898 1.9663 0.58374 1.2597 0.58374 2.9648zm-8.664 0q0 2.0738 0.87562 3.272 0.87562 1.1829 2.7344 1.1829 1.8588 0 2.719-1.1829 0.87562-1.1982 0.87562-3.272 0-2.0738-0.86026-3.2413-0.86026-1.1829-2.719-1.1829-1.8741 0-2.7497 1.1829-0.87562 1.1675-0.87562 3.2413z"/>
-   <path d="m105.6 94.215q0.30723 0 0.62983-0.04609 0.32259-0.04609 0.52229-0.12289v1.0292q-0.21506 0.10753-0.61446 0.16898-0.39941 0.07681-0.76809 0.07681-0.64519 0-1.1982-0.21506-0.53766-0.23042-0.87562-0.78345-0.33796-0.55302-0.33796-1.5515v-4.7929h-1.1675v-0.64519l1.1829-0.53766 0.53766-1.7512h0.7988v1.8895h2.3811v1.0446h-2.3811v4.7621q0 0.75272 0.35332 1.1214 0.36868 0.35332 0.93707 0.35332z"/>
-   <path d="m119.46 95.168-1.3211-3.3949h-4.3474l-1.3058 3.3949h-1.3979l4.2859-11.014h1.2443l4.2706 11.014zm-1.7359-4.6239-1.2289-3.3181q-0.0461-0.12289-0.15362-0.44549-0.10753-0.3226-0.21507-0.66055-0.0922-0.35332-0.15361-0.53766-0.1229 0.47621-0.26115 0.93706-0.12289 0.44549-0.21507 0.70664l-1.2443 3.3181z"/>
-   <path d="m125.13 95.321q-1.5362 0-2.4579-1.06-0.9217-1.0753-0.9217-3.1952t0.9217-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98314 0.89098-0.61447 0.36868-1.5823 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50694-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-   <path d="m133.47 95.168-3.1184-8.2339h1.444l1.7512 4.8543q0.12289 0.33796 0.26115 0.75272 0.13825 0.41477 0.24579 0.79881 0.10753 0.38404 0.15361 0.62983h0.0615q0.0461-0.24579 0.16898-0.62983 0.12289-0.3994 0.26115-0.79881 0.13825-0.41477 0.26115-0.75272l1.7512-4.8543h1.444l-3.1338 8.2339z"/>
-   <path d="m142.58 86.796q1.5054 0 2.2274 0.66055 0.722 0.66055 0.722 2.1046v5.607h-0.98315l-0.26115-1.1675h-0.0615q-0.53766 0.67591-1.1368 0.99851-0.59911 0.3226-1.6283 0.3226-1.1214 0-1.8588-0.58374-0.73736-0.59911-0.73736-1.8588 0-1.2289 0.96778-1.8895 0.96779-0.67591 2.9802-0.73736l1.3979-0.04609v-0.49158q0-1.0292-0.44549-1.4286t-1.2597-0.3994q-0.64519 0-1.2289 0.1997-0.58374 0.18434-1.0907 0.43013l-0.41476-1.0139q0.53766-0.29187 1.275-0.49158 0.73736-0.21506 1.5362-0.21506zm1.613 4.3474-1.2136 0.04609q-1.5362 0.06145-2.1353 0.49157-0.58375 0.43013-0.58375 1.2136 0 0.69128 0.41477 1.0139 0.43013 0.3226 1.0907 0.3226 1.0292 0 1.7205-0.56838 0.70664-0.58374 0.70664-1.782z"/>
-   <path d="m152.04 86.78q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808t-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95243 0.70663-0.3226 1.4901-0.3226z"/>
-   <path d="m160.87 95.321q-1.106 0-1.9509-0.44549-0.8449-0.44549-1.3365-1.3826-0.47622-0.93706-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50694-0.95243 1.3826-1.3979 0.87562-0.44549 1.9817-0.44549 0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41476 1.1214q-0.36869-0.13826-0.86026-0.26115-0.49157-0.12289-0.9217-0.12289-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13826 0.95243-0.33796v1.1982q-0.41477 0.21506-0.92171 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m168.13 86.78q1.0446 0 1.8127 0.46085 0.76809 0.46085 1.1675 1.3057 0.41477 0.82953 0.41477 1.9509v0.81417h-5.6378q0.0307 1.3979 0.70664 2.1353 0.69128 0.722 1.9202 0.722 0.78345 0 1.3826-0.13826 0.61447-0.15362 1.2597-0.43013v1.1829q-0.62983 0.27651-1.2443 0.3994-0.61447 0.13826-1.4594 0.13826-1.1828 0-2.0738-0.47621t-1.3979-1.4133q-0.49157-0.93706-0.49157-2.3196 0-1.3518 0.44549-2.3196 0.46085-0.96779 1.275-1.4901 0.82953-0.5223 1.9202-0.5223zm-0.0154 1.106q-0.96779 0-1.5362 0.62983-0.55302 0.61447-0.66055 1.7205h4.1937q-0.0154-1.0446-0.49157-1.6898-0.47622-0.66055-1.5054-0.66055z"/>
-   <path d="m176.53 95.321q-1.5362 0-2.4579-1.06-0.92171-1.0753-0.92171-3.1952t0.92171-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98315 0.89098-0.61446 0.36868-1.5822 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50693-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-  </g>
- </g>
-</svg>
--- a/demo/images/color_lens.svg
+++ b/demo/images/color_lens.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>color_lens icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M896,469.33c0,117.76 -95.57,213.34 -213.33,213.34h-75.52c-35.41,0 -64,28.59 -64,64c0,16.21 6.4,31.15 16.21,42.24c10.24,11.52 16.64,26.45 16.64,43.09c0,35.41 -28.59,64 -64,64c-212.05,0 -384,-171.95 -384,-384c0,-212.05 171.95,-384 384,-384c212.05,0 384,152.74 384,341.33zM341.33,448c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64zM469.33,277.33c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64zM682.67,277.33c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64zM810.67,448c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64z"/>
-	</g>
-</svg>
--- a/demo/images/crop_original.svg
+++ b/demo/images/crop_original.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>crop_original icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M896,213.33v597.34c0,46.93 -38.4,85.33 -85.33,85.33h-597.34c-46.93,0 -85.33,-38.4 -85.33,-85.33v-597.34c0,-46.93 38.4,-85.33 85.33,-85.33h597.34c46.93,0 85.33,38.4 85.33,85.33zM810.67,213.33h-597.34v597.34h597.34zM746.67,725.33h-469.34l117.34,-150.61l83.62,100.69l117.34,-151.04z"/>
-	</g>
-</svg>
--- a/demo/images/find_in_page.svg
+++ b/demo/images/find_in_page.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>find_in_page icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M689.92,672c22.19,-33.71 35.41,-73.81 35.41,-117.33c0,-117.76 -95.57,-213.34 -213.33,-213.34c-117.76,0 -213.33,95.58 -213.33,213.34c0,117.76 95.57,213.33 213.33,213.33c43.52,0 83.63,-13.22 117.76,-35.41l189.01,189.01c-14.51,10.67 -31.57,17.07 -50.77,17.07h-512.43c-46.93,0 -84.9,-38.41 -84.9,-85.34l0.42,-682.66c0,-46.93 37.98,-85.34 84.91,-85.34h341.33l256,256v494.51zM512,426.67c70.83,0 128,57.17 128,128c0,70.83 -57.17,128 -128,128c-70.83,0 -128,-57.17 -128,-128c0,-70.83 57.17,-128 128,-128z"/>
-	</g>
-</svg>
--- a/demo/images/font_download.svg
+++ b/demo/images/font_download.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>font_download icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M938.67,170.67v682.66c0,46.93 -38.41,85.34 -85.34,85.34h-682.66c-46.93,0 -85.34,-38.41 -85.34,-85.34v-682.66c0,-46.93 38.41,-85.34 85.34,-85.34h682.66c46.93,0 85.34,38.41 85.34,85.34zM769.71,789.33l-218.03,-554.66h-79.36l-218.03,554.66h89.18l47.78,-128h240.64l48.64,128zM512,340.48l88.32,235.52h-176.64z"/>
-	</g>
-</svg>
--- a/demo/images/lock.svg
+++ b/demo/images/lock.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>lock icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M853.33,426.67v426.66c0,46.93 -38.4,85.34 -85.33,85.34h-512c-46.93,0 -85.33,-38.41 -85.33,-85.34v-426.66c0,-46.93 38.4,-85.34 85.33,-85.34h42.67v-85.33c0,-117.76 95.57,-213.33 213.33,-213.33c117.76,0 213.33,95.57 213.33,213.33v85.33h42.67c46.93,0 85.33,38.41 85.33,85.34zM644.27,256c0,-72.96 -59.31,-132.27 -132.27,-132.27c-72.96,0 -132.27,59.31 -132.27,132.27v85.33h264.54zM597.33,640c0,-46.93 -38.4,-85.33 -85.33,-85.33c-46.93,0 -85.33,38.4 -85.33,85.33c0,46.93 38.4,85.33 85.33,85.33c46.93,0 85.33,-38.4 85.33,-85.33z"/>
-	</g>
-</svg>
--- a/demo/images/lock_open.svg
+++ b/demo/images/lock_open.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>lock_open icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M853.33,426.67v426.66c0,46.93 -38.4,85.34 -85.33,85.34h-512c-46.93,0 -85.33,-38.41 -85.33,-85.34v-426.66c0,-46.93 38.4,-85.34 85.33,-85.34h388.27v-85.33c0,-72.96 -59.31,-132.27 -132.27,-132.27c-72.96,0 -132.27,59.31 -132.27,132.27h-81.06c0,-117.76 95.57,-213.33 213.33,-213.33c117.76,0 213.33,95.57 213.33,213.33v85.33h42.67c46.93,0 85.33,38.41 85.33,85.34zM768,426.67h-512v426.66h512zM426.67,640c0,-46.93 38.4,-85.33 85.33,-85.33c46.93,0 85.33,38.4 85.33,85.33c0,46.93 -38.4,85.33 -85.33,85.33c-46.93,0 -85.33,-38.4 -85.33,-85.33z"/>
-	</g>
-</svg>
--- a/demo/images/lock_outline.svg
+++ b/demo/images/lock_outline.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>lock_outline icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M853.33,426.67v426.66c0,46.93 -38.4,85.34 -85.33,85.34h-512c-46.93,0 -85.33,-38.41 -85.33,-85.34v-426.66c0,-46.93 38.4,-85.34 85.33,-85.34h42.67v-85.33c0,-117.76 95.57,-213.33 213.33,-213.33c117.76,0 213.33,95.57 213.33,213.33v85.33h42.67c46.93,0 85.33,38.41 85.33,85.34zM768,426.67h-512v426.66h512zM379.73,341.33h264.54v-85.33c0,-72.96 -59.31,-132.27 -132.27,-132.27c-72.96,0 -132.27,59.31 -132.27,132.27zM426.67,640c0,-46.93 38.4,-85.33 85.33,-85.33c46.93,0 85.33,38.4 85.33,85.33c0,46.93 -38.4,85.33 -85.33,85.33c-46.93,0 -85.33,-38.4 -85.33,-85.33z"/>
-	</g>
-</svg>
--- a/demo/images/panorama.svg
+++ b/demo/images/panorama.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>panorama icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M896,853.33h-768c-46.93,0 -85.33,-38.4 -85.33,-85.33v-512c0,-46.93 38.4,-85.33 85.33,-85.33h768c46.93,0 85.33,38.4 85.33,85.33v512c0,46.93 -38.4,85.33 -85.33,85.33zM213.33,725.33h597.34l-192,-256l-149.34,192.43l-106.66,-128.43z"/>
-	</g>
-</svg>
--- a/demo/images/perm_media.svg
+++ b/demo/images/perm_media.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>perm_media icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M1024,256v426.67c0,46.93 -38.4,85.33 -85.33,85.33h-682.67c-46.93,0 -85.33,-38.4 -85.33,-85.33l0.42,-512c0,-46.93 37.98,-85.34 84.91,-85.34h256l85.33,85.34h341.34c46.93,0 85.33,38.4 85.33,85.33zM85.33,853.33h768v85.34h-768c-46.93,0 -85.33,-38.41 -85.33,-85.34l0.43,-384h-0.43v-213.33h85.33zM896,640l-149.33,-192l-106.67,128.43l-149.33,-192.43l-192,256z"/>
-	</g>
-</svg>
--- a/demo/images/photo.svg
+++ b/demo/images/photo.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>photo icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M810.67,896h-597.34c-46.93,0 -85.33,-38.4 -85.33,-85.33v-597.34c0,-46.93 38.4,-85.33 85.33,-85.33h597.34c46.93,0 85.33,38.4 85.33,85.33v597.34c0,46.93 -38.4,85.33 -85.33,85.33zM213.33,768h597.34l-192,-256l-149.34,192.43l-106.66,-128.43z"/>
-	</g>
-</svg>
--- a/demo/images/tab.svg
+++ b/demo/images/tab.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>tab icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M981.33,213.33v597.34c0,46.93 -38.4,85.33 -85.33,85.33h-768c-46.93,0 -85.33,-38.4 -85.33,-85.33v-597.34c0,-46.93 38.4,-85.33 85.33,-85.33h768c46.93,0 85.33,38.4 85.33,85.33zM896,384h-341.33v-170.67h-426.67v597.34h768z"/>
-	</g>
-</svg>
--- a/demo/images/zoom_in.svg
+++ b/demo/images/zoom_in.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>zoom_in icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M874.24,810.67l-63.57,63.57l-213.34,-212.91v-33.7l-11.52,-11.95c-48.64,41.81 -111.79,66.99 -180.48,66.99c-153.17,0 -277.33,-124.17 -277.33,-277.34c0,-153.17 124.16,-277.33 277.33,-277.33c153.17,0 277.34,124.16 277.34,277.33c0,68.69 -25.18,131.84 -66.99,180.48l11.95,11.52h33.7zM597.33,405.33c0,-106.24 -85.76,-192 -192,-192c-106.24,0 -192,85.76 -192,192c0,106.24 85.76,192 192,192c106.24,0 192,-85.76 192,-192zM512,426.67h-85.33v85.33h-42.67v-85.33h-85.33v-42.67h85.33v-85.33h42.67v85.33h85.33z"/>
-	</g>
-</svg>
--- a/demo/images/zoom_out.svg
+++ b/demo/images/zoom_out.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>zoom_out icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M874.24,810.67l-63.57,63.57l-213.34,-212.91v-33.7l-11.52,-11.95c-48.64,41.81 -111.79,66.99 -180.48,66.99c-153.17,0 -277.33,-124.17 -277.33,-277.34c0,-153.17 124.16,-277.33 277.33,-277.33c153.17,0 277.34,124.16 277.34,277.33c0,68.69 -25.18,131.84 -66.99,180.48l11.95,11.52h33.7zM597.33,405.33c0,-106.24 -85.76,-192 -192,-192c-106.24,0 -192,85.76 -192,192c0,106.24 85.76,192 192,192c106.24,0 192,-85.76 192,-192zM298.67,384h213.33v42.67h-213.33z"/>
-	</g>
-</svg>
--- a/demo/images/zoom_out_map.svg
+++ b/demo/images/zoom_out_map.svg
@@ -1,6 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
-	<desc>zoom_out_map icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
-	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
-		<path d="M896,896h-256l98.13,-98.13l-123.3,-122.46l60.58,-60.58l122.46,123.3l98.13,-98.13zM896,128v256l-98.13,-98.13l-122.46,123.3l-60.58,-60.58l123.3,-122.46l-98.13,-98.13zM128,896v-256l98.13,98.13l122.46,-123.3l60.58,60.58l-123.3,122.46l98.13,98.13zM128,128h256l-98.13,98.13l123.3,122.46l-60.58,60.58l-122.46,-123.3l-98.13,98.13z"/>
-	</g>
-</svg>
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -41,23 +41,21 @@ int main(int argc, char *argv[])
    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
 #endif
-    QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
 	std::shared_ptr<int> b;
 	QApplication a(argc, argv);
 	a.setApplicationName("Advanced Docking System Demo");
 	a.setQuitOnLastWindowClosed(true);
-	a.setWindowIcon(QIcon(":/adsdemo/images/ads_icon2.svg"));
-
-	qInstallMessageHandler(myMessageOutput);
-	qDebug() << "Message handler test";
-
-	CMainWindow mw;
-	mw.show();

 	QFile StyleSheetFile(":/adsdemo/app.css");
 	StyleSheetFile.open(QIODevice::ReadOnly);
 	QTextStream StyleSheetStream(&StyleSheetFile);
 	a.setStyleSheet(StyleSheetStream.readAll());
 	StyleSheetFile.close();
+
+	qInstallMessageHandler(myMessageOutput);
+	qDebug() << "Message handler test";
+
+	CMainWindow mw;
+	mw.show();
 	return a.exec();
 }
--- a/demo/res/visual_studio_light.css
+++ b/demo/res/visual_studio_light.css
@@ -1,379 +0,0 @@
-
-/*
- * Visual Studio like light theme
- */
- 
-/*****************************************************************************
- * CDockManager
- *****************************************************************************/
-ads--CDockManager 
-{
-	background: palette(window);
-} 
- 
- 
-
-/*****************************************************************************
- * CDockContainerWidget
- *****************************************************************************/ 
-ads--CDockContainerWidget {
-	background: palette(window);
-	padding: 2px;
-}
-
-
-/*****************************************************************************
- * CDockAreaWidget
- *****************************************************************************/
-ads--CDockAreaWidget {
-	background: palette(window);
-	/*border: 1px solid palette(dark);*/
-}
-
-
-ads--CDockAreaTitleBar {
-	background: transparent;
-	border-bottom: 2px solid rgb(204, 204, 204);
-	padding-bottom: 0px;
-}
-
-
-ads--CTitleBarButton {
-	padding: 0px 0px;
-	background: transparent;
-	border: none;
-}
-
-ads--CTitleBarButton:hover {
-	background: rgba(0, 0, 0, 24);
-}
-
-ads--CTitleBarButton:pressed {
-	background: rgba(0, 0, 0, 48);
-}
-
-QScrollArea#dockWidgetScrollArea {
-	padding: 0px;
-	border: none;
-}
-
-#tabsMenuButton::menu-indicator {
-	image: none;
-}
-
-
-#dockAreaCloseButton {
-	qproperty-icon: url(:/ads/images/close-button.svg),
-		url(:/ads/images/close-button-disabled.svg) disabled;
-	qproperty-iconSize: 16px;
-}
-
-#detachGroupButton {
-	qproperty-icon: url(:/ads/images/detach-button.svg),
-		url(:/ads/images/detach-button-disabled.svg) disabled;
-	qproperty-iconSize: 16px;	
-}
-
-
-ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar {
-	border-bottom: 2px solid palette(highlight);
-}
-
-
-/*****************************************************************************
- * CDockWidgetTab
- *****************************************************************************/
-ads--CDockWidgetTab {
-	background: palette(window);
-	border: none;
-	padding: 0 0px;
-	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-}
-
-ads--CDockWidgetTab[activeTab="true"] {
-	background: rgb(204, 204, 204);
-}
-
-ads--CDockWidgetTab QLabel {
-	color: palette(foreground);
-}
-
-ads--CDockWidgetTab[activeTab="true"] QLabel {
-	color: palette(foreground);
-}
-
-
-#tabCloseButton {
-	margin-top: 2px;
-	background: none;
-	border: none;
-	padding: 0px -2px;
-	qproperty-icon: url(:/ads/images/close-button.svg),
-		url(:/ads/images/close-button-disabled.svg) disabled;
-	qproperty-iconSize: 16px;
-}
-
-#tabCloseButton:hover {
-	/*border: 1px solid rgba(0, 0, 0, 32);*/
-	background: rgba(0, 0, 0, 24);
-}
-
-#tabCloseButton:pressed {
-	background: rgba(0, 0, 0, 48);
-}
-
-
-/* Focus related styling */
-ads--CDockWidgetTab[focused="true"] {
-	background: palette(highlight);
-	border-color: palette(highlight);
-}
-
-ads--CDockWidgetTab[focused="true"] > #tabCloseButton {
-	qproperty-icon: url(:/ads/images/close-button-focused.svg)
-}
-
-ads--CDockWidgetTab[focused="true"]>#tabCloseButton:hover {
-	background: rgba(255, 255, 255, 48);
-}
-
-ads--CDockWidgetTab[focused="true"]>#tabCloseButton:pressed {
-	background: rgba(255, 255, 255, 92);
-}
-
-ads--CDockWidgetTab[focused="true"] QLabel {
-	color: palette(light);
-}
-
-
-/*****************************************************************************
- * CDockWidget
- *****************************************************************************/
-ads--CDockWidget {
-	background: palette(light);
-	border: 1px solid rgb(204, 204, 204);
-	border-top: none;
-}
-
-
-
-/*****************************************************************************
- *
- * Styling of auto hide functionality
- *
- *****************************************************************************/
- 
- 
-/*****************************************************************************
- * CAutoHideTab
- *****************************************************************************/
-ads--CAutoHideTab {
-	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-	background: none;
-	border: none;
-	padding-left: 2px;
-	padding-right: 0px;
-	text-align: center;
-	min-height: 20px;
-	padding-bottom: 2px;
-}
-
-
-ads--CAutoHideTab:hover
-{
-	color: palette(highlight);
-}
-
-
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="0"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="2"]  {
-	border-top: 6px solid rgba(0, 0, 0, 48);
-}
-
-
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="1"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="3"] {
-	border-bottom: 6px solid rgba(0, 0, 0, 48);
-}
-
-
-
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="0"],
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="2"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="0"][activeTab="true"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="2"][activeTab="true"]  {
-	border-top: 6px solid palette(highlight);
-}
-
-
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="1"],
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="3"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="1"][activeTab="true"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="3"][activeTab="true"] {
-	border-bottom: 6px solid palette(highlight);
-}
-
-
-/**
- * Auto hide tabs with icon only
- */
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="0"] {
-	border-top: 6px solid rgba(0, 0, 0, 48);
-}
-
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="1"] {
-	border-left: 6px solid rgba(0, 0, 0, 48);
-}
-
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="2"] {
-	border-right: 6px solid rgba(0, 0, 0, 48);
-}
-
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="3"] {
-	border-bottom: 6px solid rgba(0, 0, 0, 48);
-}
-
-
-/**
- * Auto hide tabs with icon only hover
- */
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="0"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="0"][activeTab="true"] {
-	border-top: 6px solid palette(highlight);
-}
-
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="1"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="1"][activeTab="true"] {
-	border-left: 6px solid palette(highlight);
-}
-
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="2"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="2"][activeTab="true"] {
-	border-right: 6px solid palette(highlight);
-}
-
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="3"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="3"][activeTab="true"] {
-	border-bottom: 6px solid palette(highlight);
-}
-
-
-
-/*****************************************************************************
- * CAutoHideSideBar
- *****************************************************************************/
-ads--CAutoHideSideBar{
-	background: palette(window);
-	border: none;
-	qproperty-spacing: 12;
-}
-
-#sideTabsContainerWidget {
-	background: transparent;
-}
-
-
-ads--CAutoHideSideBar[sideBarLocation="0"] {
-	border-bottom: 1px solid palette(dark);
-}
-
-ads--CAutoHideSideBar[sideBarLocation="1"] {
-	border-right: 1px solid palette(dark);
-}
-
-ads--CAutoHideSideBar[sideBarLocation="2"] {
-	border-left: 1px solid palette(dark);
-}
-
-ads--CAutoHideSideBar[sideBarLocation="3"] {
-	border-top: 1px solid palette(dark);
-}
-
-
-/*****************************************************************************
- * CAutoHideDockContainer
- *****************************************************************************/
-ads--CAutoHideDockContainer {
-	background: palette(window);
-}
-
-
-ads--CAutoHideDockContainer ads--CDockAreaTitleBar {
-	background: palette(highlight);
-	padding: 0px;
-	border: none;
-}
-
-
-/*
- * This is required because the ads--CDockAreaWidget[focused="true"] will 
- * overwrite the ads--CAutoHideDockContainer ads--CDockAreaTitleBar rule
- */
-ads--CAutoHideDockContainer ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar {
-	background: palette(highlight);
-	padding: 0px;
-	border: none;
-}
-
-
-#autoHideTitleLabel {
-	padding-left: 4px;
-	color: palette(light);
-}
-
-
-/*****************************************************************************
- * CAutoHideDockContainer titlebar buttons
- *****************************************************************************/
-#dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button.svg);
-	qproperty-iconSize: 16px;
-}
-
-ads--CAutoHideDockContainer #dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button-pinned-focused.svg);
-	qproperty-iconSize: 16px;
-}
-
-
-ads--CAutoHideDockContainer #dockAreaCloseButton{
-	qproperty-icon: url(:/ads/images/close-button-focused.svg)
-}
-
-
-ads--CAutoHideDockContainer ads--CTitleBarButton:hover {
-	background: rgba(255, 255, 255, 48);
-}
-
-ads--CAutoHideDockContainer ads--CTitleBarButton:pressed {
-	background: rgba(255, 255, 255, 96);
-}
-
-/*****************************************************************************
- * CAutoHideDockContainer Titlebar and Buttons
- *****************************************************************************/
-
-
-/*****************************************************************************
- * CResizeHandle
- *****************************************************************************/
-ads--CResizeHandle {
-	background: palette(window);
-}
-
-
-ads--CAutoHideDockContainer[sideBarLocation="0"] ads--CResizeHandle {
-	border-top: 1px solid palette(dark);
-}
-
-ads--CAutoHideDockContainer[sideBarLocation="1"] ads--CResizeHandle {
-	border-left: 1px solid palette(dark);
-}
-
-ads--CAutoHideDockContainer[sideBarLocation="2"] ads--CResizeHandle {
-	border-right: 1px solid palette(dark);
-}
-
-ads--CAutoHideDockContainer[sideBarLocation="3"] ads--CResizeHandle {
-	border-top: 1px solid palette(dark);
-}
--- a/demo/status_dialog.py
+++ b/demo/status_dialog.py
@@ -2,7 +2,7 @@ import os
 import sys

 from PyQt5 import uic
-import PyQtAds as QtAds
+from PyQtAds import QtAds

 UI_FILE = os.path.join(os.path.dirname(__file__), 'StatusDialog.ui')
 StatusDialogUI, StatusDialogBase = uic.loadUiType(UI_FILE)
--- a/doc/AutoHide_Animation.gif
+++ b/doc/AutoHide_Animation.gif
--- a/doc/AutoHide_Change_Sidebar.gif
+++ b/doc/AutoHide_Change_Sidebar.gif
--- a/doc/AutoHide_Context_Menu.png
+++ b/doc/AutoHide_Context_Menu.png
--- a/doc/AutoHide_Drag_DockArea.gif
+++ b/doc/AutoHide_Drag_DockArea.gif
--- a/doc/AutoHide_Drag_to_Float_or_Dock.gif
+++ b/doc/AutoHide_Drag_to_Float_or_Dock.gif
--- a/doc/AutoHide_Drag_to_Sidebar.gif
+++ b/doc/AutoHide_Drag_to_Sidebar.gif
--- a/doc/AutoHide_Movie.gif
+++ b/doc/AutoHide_Movie.gif
--- a/doc/AutoHide_PinTo.png
+++ b/doc/AutoHide_PinTo.png
--- a/doc/AutoHide_Sort_Tabs.gif
+++ b/doc/AutoHide_Sort_Tabs.gif
--- a/doc/AutoHide_Tab_Insert_Order.gif
+++ b/doc/AutoHide_Tab_Insert_Order.gif
--- a/doc/DockArea_Tab_Insertion_Order.gif
+++ b/doc/DockArea_Tab_Insertion_Order.gif
--- a/doc/Feature_ImageViewer.png
+++ b/doc/Feature_ImageViewer.png
--- a/doc/ads_icon.svg
+++ b/doc/ads_icon.svg
@@ -1,77 +1,123 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   version="1.1"
-   viewBox="0 0 1023.99 1023.99"
-   id="svg26"
-   sodipodi:docname="ads_icon.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   width="1023.99"
-   height="1023.99"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0,0,1024,1024"
+   id="svg1145"
+   sodipodi:docname="ads_icon.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="C:\CodingXP\cetoni_projects\QtAdvancedDockingSystem\doc\ads_icon_256.png"
+   inkscape:export-xdpi="24"
+   inkscape:export-ydpi="24">
+  <metadata
+     id="metadata1151">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
  <defs
-     id="defs30" />
+     id="defs1149" />
  <sodipodi:namedview
-     id="namedview28"
     pagecolor="#ffffff"
     bordercolor="#666666"
-     borderopacity="1.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="0.12999302"
-     inkscape:cx="3277.099"
-     inkscape:cy="-257.70614"
     inkscape:window-width="1920"
     inkscape:window-height="1017"
+     id="namedview1147"
+     showgrid="false"
+     inkscape:zoom="0.32593202"
+     inkscape:cx="256.13402"
+     inkscape:cy="235.82602"
     inkscape:window-x="1912"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
-     inkscape:current-layer="svg26"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
+     inkscape:current-layer="svg1145" />
  <desc
-     id="desc2">electric_iron icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none"
-     x="1251.1022"
-     y="1305.4956"
-     id="text9788"><tspan
-       sodipodi:role="line"
-       id="tspan9786"
-       x="1251.1022"
-       y="1305.4956" /></text>
-  <g
-     id="g94691"
-     transform="translate(581.23034,1750.5233)">
-    <path
-       d="m 191.63966,-726.53328 h -521.75 c -138.69,0 -251.12,-112.43001 -251.12,-251.12 v -521.75002 c 0,-138.69 112.43,-251.12 251.12,-251.12 h 521.75 c 138.69,0 251.12,112.43 251.12,251.12 v 521.75002 c 0,138.68999 -112.43,251.12 -251.12,251.12 z"
-       fill="#707070"
-       id="path4-5"
-       style="mix-blend-mode:normal;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero" />
-    <path
-       id="path927"
-       style="mix-blend-mode:normal;fill:#009ddd;fill-opacity:1;fill-rule:nonzero"
-       d="m -175.90039,-1515.8633 v 256 h 469.3301 v -256 z" />
-    <path
-       id="path16513"
-       style="mix-blend-mode:normal;fill:#ff9833;fill-opacity:1;fill-rule:nonzero"
-       d="m 80.099609,-1217.1934 v 256.00004 H 293.42969 v -256.00004 z" />
-    <path
-       id="path16513-5"
-       style="mix-blend-mode:normal;fill:#accb01;fill-opacity:1;fill-rule:nonzero"
-       d="m -175.90039,-1217.1933 v 256 H 37.42969 v -256 z" />
-    <path
-       id="path24788"
-       style="mix-blend-mode:normal;fill:#0083c3;fill-opacity:1;fill-rule:nonzero"
-       d="m -431.90039,-1515.8633 v 554.66994 h 213.33008 v -554.66994 z" />
-  </g>
+     id="desc1129">window_size icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
+  <path
+     id="path1797-1"
+     visibility="hidden"
+     d="M 71.53142,291.89723 H 950.1828 l 0.6743,0.6742 v 586.08 l -0.6743,0.6743 H 71.53142 l -0.6743,-0.6743 v -586.08 z"
+     inkscape:connector-curvature="0"
+     style="visibility:hidden;mix-blend-mode:normal;fill:#ffffff;fill-rule:nonzero;stroke-width:0.99999988;fill-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     y="412.13489"
+     x="-911.34436"
+     height="560.90375"
+     width="327.70862"
+     id="rect1739-8"
+     style="opacity:1;fill:#ffd292;fill-opacity:1;stroke:none;stroke-width:37.79526901;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+  <path
+     id="path1799"
+     d="M 988.40121,578.11175 V 651.2546 H 409.96541 V 578.11175 Z"
+     inkscape:connector-curvature="0"
+     style="mix-blend-mode:normal;fill:#546e7a;fill-rule:nonzero;stroke-width:0.99999988" />
+  <rect
+     style="opacity:1;fill:#b3c3cb;fill-opacity:1;stroke:none;stroke-width:37.79526901;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+     id="rect1739-6-1"
+     width="655.41724"
+     height="338.99207"
+     x="-914.85529"
+     y="38.243896"
+     transform="rotate(-90)" />
+  <path
+     id="path1801-7"
+     d="m 73.1429,73.14287 h 877.7142 c 40.2857,0 73.1429,32.86857 73.1429,73.14285 V 914.2857 c 0,20.12571 -16.4458,36.57142 -36.5715,36.57142 H 36.5714 C 16.4343,950.85712 0,934.42284 0,914.2857 V 146.28572 C 0,106.00001 32.8571,73.14287 73.1429,73.14287 Z m 0,219.42856 V 877.71427 H 950.8571 V 292.57143 Z"
+     inkscape:connector-curvature="0"
+     style="mix-blend-mode:normal;fill:#546e7a;fill-rule:nonzero;stroke-width:0.99999988" />
+  <path
+     id="path1799-6"
+     d="M 359.8801,276.79402 H 433.023 V 886.78767 H 359.8801 Z"
+     inkscape:connector-curvature="0"
+     style="mix-blend-mode:normal;fill:#546e7a;fill-rule:nonzero;stroke-width:0.99999988" />
+  <circle
+     r="36.81749"
+     cy="169.78555"
+     cx="920.66248"
+     id="path1917-42"
+     style="opacity:1;fill:#ffa726;fill-opacity:1;stroke:none;stroke-width:63.79999924;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+  <circle
+     r="36.81749"
+     cy="169.78555"
+     cx="817.22302"
+     id="path1917-4-6"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:63.79999924;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+  <path
+     id="path1799-8"
+     d="m 615.67076,292.13464 v 73.14285 H 433.023 v -73.14285 z"
+     inkscape:connector-curvature="0"
+     style="mix-blend-mode:normal;fill:#95abb6;fill-rule:nonzero;stroke-width:0.99999994;fill-opacity:1" />
+  <path
+     id="path1799-8-1"
+     d="m 798.31852,292.13464 v 73.14285 H 615.67076 v -73.14285 z"
+     inkscape:connector-curvature="0"
+     style="mix-blend-mode:normal;fill:#c7d4d9;fill-rule:nonzero;stroke-width:0.99999994;fill-opacity:1" />
+  <path
+     id="path1799-8-7"
+     d="m 255.79066,292.57143 v 73.14285 H 73.1429 v -73.14285 z"
+     inkscape:connector-curvature="0"
+     style="mix-blend-mode:normal;fill:#dfe5e9;fill-opacity:1;fill-rule:nonzero;stroke-width:0.99999994" />
+  <path
+     id="path1799-8-7-6"
+     d="m 616.34083,651.15739 v 73.14285 H 433.69307 v -73.14285 z"
+     inkscape:connector-curvature="0"
+     style="mix-blend-mode:normal;fill:#ffba56;fill-opacity:1;fill-rule:nonzero;stroke-width:0.99999994" />
 </svg>
--- a/doc/ads_icon_256.png
+++ b/doc/ads_icon_256.png
--- a/doc/ads_icon_512.png
+++ b/doc/ads_icon_512.png
--- a/doc/ads_logo.svg
+++ b/doc/ads_logo.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1032" height="151.81" version="1.1" viewBox="0 0 1032 151.81" xmlns="http://www.w3.org/2000/svg">
- <desc>electric_iron icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
- <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956"/></text>
- <g transform="scale(.14825)" stroke-width="6.7454">
-  <g fill="#8f918f" aria-label="Qt Advanced Docking">
-   <path d="m1416.3 726.04q-93.219 0-148.72-61.942-55.196-61.942-55.196-160.99 0-105.18 56.729-168.35 57.035-63.475 155.47-63.475 88.926 0 143.82 61.022 55.196 60.715 55.196 159.45 0 109.16-56.422 171.72-17.479 19.625-38.944 32.811l106.71 81.26h-51.209l-83.1-66.848q-37.41 15.332-84.327 15.332zm3.0664-427.15q-76.66 0-126.34 55.502-49.369 55.502-49.369 145.35 0 90.766 46.916 144.74 46.916 53.662 125.11 53.662 81.567 0 129.1-53.049 47.53-53.356 47.53-148.41 0-93.219-46.61-145.35-46.303-52.436-126.34-52.436z"/>
-   <path d="m1826.9 714.08q-22.078 10.426-41.397 10.426-69.608 0-69.608-83.407v-210.97h-56.422v-25.758h56.422v-81.567q6.7461-2.4531 14.106-4.9063 7.3594-2.1465 14.106-4.5996v91.073h82.793v25.758h-82.793v207.29q0 32.504 10.119 47.223 10.426 14.412 34.957 14.412 17.479 0 37.717-11.346z"/>
-   <path d="m2353.7 718.37-50.289-136.76h-190.73l-50.289 136.76h-33.424l165.89-439.72h28.824l164.05 439.72zm-134.92-367.97q-3.373-9.1993-5.5195-18.092-2.1465-7.6661-4.5997-15.332h-1.2265q-5.2129 20.238-10.119 32.811l-73.901 203.92h169.57z"/>
-   <path d="m2679 718.37v-57.035h-1.2266q-15.332 29.744-45.383 47.223-30.051 17.479-67.768 17.479-57.955 0-94.752-42.317-36.49-42.317-36.49-116.83 0-76.047 39.864-122.96 40.17-47.223 103.95-47.223 70.528 0 100.58 57.955h1.2266v-201.16h28.211v464.87zm0-191.04q0-43.85-27.904-74.207-27.598-30.664-74.514-30.664-49.369 0-81.567 38.024-32.198 37.717-32.198 103.95 0 65.008 28.824 100.58 29.131 35.264 74.821 35.264 53.662 0 83.1-33.117 29.438-33.424 29.438-81.26z"/>
-   <path d="m2910.8 718.37h-25.758l-121.43-314h31.584l93.526 249.91q6.7462 18.092 9.5059 32.811h1.2266q3.9864-19.318 8.8926-31.584l96.592-251.14h30.664z"/>
-   <path d="m3280 718.37v-62.862h-1.2265q-15.026 32.197-43.85 51.516-28.518 19.012-63.475 19.012-44.77 0-70.834-25.145t-26.065-63.475q0-82.18 108.86-99.352l96.592-14.412q0-101.19-76.047-101.19-51.822 0-100.89 41.703v-34.037q17.479-13.799 47.223-23.611 30.051-9.8126 56.422-9.8126 48.449 0 74.821 30.051 26.678 30.051 26.678 87.393v204.22zm-86.473-156.39q-49.369 7.0528-69.301 22.998-19.932 15.639-19.932 51.209 0 27.904 18.398 45.996 18.705 18.092 51.822 18.092 45.383 0 75.434-33.424 30.051-33.731 30.051-86.78v-30.664z"/>
-   <path d="m3616.1 718.37v-182.76q0-113.15-81.567-113.15-45.383 0-74.514 33.424-29.131 33.117-29.131 82.18v180.31h-28.211v-314h28.211v57.035h1.2266q34.344-64.701 107.32-64.701 50.903 0 77.887 34.037 26.984 33.731 26.984 96.592v191.04z"/>
-   <path d="m3942.1 704.57q-34.957 21.465-83.407 21.465-64.088 0-103.34-43.85-39.25-44.156-39.25-115.3 0-74.821 44.156-122.35 44.156-47.836 113.46-47.836 35.877 0 69.608 14.719v31.891q-33.731-20.852-73.901-20.852-55.196 0-89.54 39.863-34.344 39.557-34.344 102.73 0 61.022 31.278 98.125 31.584 37.104 83.1 37.104 47.223 0 82.18-25.145z"/>
-   <path d="m4024.3 562.6q0 64.701 29.744 101.19 30.051 36.49 82.18 36.49 52.742 0 103.03-38.944v30.051q-48.756 34.651-108.86 34.651-60.715 0-98.126-43.543-37.41-43.543-37.41-122.96 0-68.688 38.944-115.6 39.25-47.223 101.81-47.223 58.569 0 89.846 41.09t31.278 112.23v12.572zm203-25.758q-1.8399-54.276-26.065-84.327-24.225-30.051-66.848-30.051-44.156 0-73.287 29.744-28.824 29.438-35.57 84.633z"/>
-   <path d="m4557.5 718.37v-57.035h-1.2266q-15.332 29.744-45.383 47.223-30.051 17.479-67.768 17.479-57.955 0-94.752-42.317-36.49-42.317-36.49-116.83 0-76.047 39.863-122.96 40.17-47.223 103.95-47.223 70.528 0 100.58 57.955h1.2266v-201.16h28.211v464.87zm0-191.04q0-43.85-27.904-74.207-27.598-30.664-74.514-30.664-49.369 0-81.567 38.024-32.197 37.717-32.197 103.95 0 65.008 28.824 100.58 29.131 35.264 74.821 35.264 53.662 0 83.1-33.117 29.438-33.424 29.438-81.26z"/>
-   <path d="m4864.5 718.37v-439.72h110.08q109.47 0 166.51 54.582 57.035 54.582 57.035 159.15 0 100.58-61.328 163.44-61.022 62.555-168.65 62.555zm30.358-411.82v384.22h68.994q97.819 0 150.25-50.596 52.436-50.903 52.436-146.57 0-187.05-196.56-187.05z"/>
-   <path d="m5407.5 726.04q-68.688 0-108.86-45.076-39.863-45.383-39.863-117.75 0-78.194 41.703-122.35 42.01-44.156 110.39-44.156 67.155 0 106.1 43.85 38.944 43.85 38.944 121.43 0 73.287-39.863 118.67-39.557 45.383-108.55 45.383zm2.1465-303.58q-55.502 0-88.62 37.41-32.811 37.41-32.811 103.95 0 61.635 32.197 99.045 32.197 37.41 88.006 37.41 56.729 0 87.393-36.797t30.664-102.11q0-67.155-30.664-103.03-30.358-35.877-86.166-35.877z"/>
-   <path d="m5837.1 704.57q-34.957 21.465-83.407 21.465-64.088 0-103.34-43.85-39.25-44.156-39.25-115.3 0-74.821 44.156-122.35 44.156-47.836 113.46-47.836 35.877 0 69.608 14.719v31.891q-33.731-20.852-73.901-20.852-55.196 0-89.54 39.863-34.344 39.557-34.344 102.73 0 61.022 31.278 98.125 31.584 37.104 83.1 37.104 47.223 0 82.18-25.145z"/>
-   <path d="m6092.2 718.37-150.25-155.16h-1.2266v155.16h-28.211v-464.87h28.211v299.59h1.2266l142.59-148.72h36.49l-149.03 152.09 160.99 161.91z"/>
-   <path d="m6205.1 325.26q-9.1992 0-16.252-6.7461-7.0528-6.7461-7.0528-17.172 0-10.119 7.0528-16.252 7.3594-6.4395 16.252-6.4395 9.506 0 16.559 6.1328 7.3594 6.1328 7.3594 16.559 0 9.8126-7.0527 16.865-7.0528 7.0528-16.865 7.0528zm-13.799 393.12v-314h28.211v314z"/>
-   <path d="m6533.5 718.37v-182.76q0-113.15-81.567-113.15-45.383 0-74.514 33.424-29.131 33.117-29.131 82.18v180.31h-28.211v-314h28.211v57.035h1.2265q34.344-64.701 107.32-64.701 50.902 0 77.887 34.037 26.984 33.731 26.984 96.592v191.04z"/>
-   <path d="m6907.3 695.07q0 88.62-38.637 129.71-38.637 41.09-120.2 41.09-45.383 0-93.526-23.918v-29.438q49.676 27.598 94.139 27.598 130.02 0 130.02-137.38v-40.783h-1.2266q-37.104 64.088-113.15 64.088-57.955 0-94.752-42.01-36.49-42.01-36.49-117.14t39.557-122.66q39.557-47.53 104.26-47.53 69.301 0 100.58 57.342h1.2266v-49.676h28.211zm-28.211-170.19q0-41.703-28.211-72.061-27.904-30.358-72.981-30.358-51.822 0-83.407 38.944-31.584 38.944-31.584 103.03 0 64.395 28.824 100.27 29.131 35.57 76.66 35.57 50.596 0 80.647-32.811 30.051-32.811 30.051-80.34z"/>
-  </g>
-  <g transform="translate(581.23 1750.5)">
-   <path d="m191.64-726.53h-521.75c-138.69 0-251.12-112.43-251.12-251.12v-521.75c0-138.69 112.43-251.12 251.12-251.12h521.75c138.69 0 251.12 112.43 251.12 251.12v521.75c0 138.69-112.43 251.12-251.12 251.12z" fill="#e0e0e0" style="mix-blend-mode:normal"/>
-   <path d="m-175.9-1515.9v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-   <path d="m80.1-1217.2v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-   <path d="m-175.9-1217.2v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-   <path d="m-431.9-1515.9v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
-  </g>
- </g>
-</svg>
--- a/doc/ads_logo_ukraine.jpg
+++ b/doc/ads_logo_ukraine.jpg
--- a/doc/ads_qt_marketplace_description.md
+++ b/doc/ads_qt_marketplace_description.md
@@ -12,10 +12,24 @@ styles as much as possible.

 ## Features

-### Docking everywhere - with or without a central widget
+### Overview

-The Advanced Docking System works with or without a central widget.
-You can dock on every border of the main window or you can dock into each dock area - so you are
+- [Features](#features)
+  - [Overview](#overview)
+  - [Docking everywhere - no central widget](#docking-everywhere---no-central-widget)
+  - [Docking inside floating windows](#docking-inside-floating-windows)
+  - [Grouped dragging](#grouped-dragging)
+  - [Perspectives for fast switching of the complete main window layout](#perspectives-for-fast-switching-of-the-complete-main-window-layout)
+  - [Opaque and non-opaque splitter resizing](#opaque-and-non-opaque-splitter-resizing)
+  - [Opaque and non-opaque undocking](#opaque-and-non-opaque-undocking)
+  - [Tab-menu for easy handling of many tabbed dock widgets](#tab-menu-for-easy-handling-of-many-tabbed-dock-widgets)
+  - [Many different ways to detach dock widgets](#many-different-ways-to-detach-dock-widgets)
+  - [Supports deletion of dynamically created dock widgets](#supports-deletion-of-dynamically-created-dock-widgets)
+
+### Docking everywhere - no central widget
+
+There is no central widget like in the Qt docking system. You can dock on every
+border of the main window or you can dock into each dock area - so you are
 free to dock almost everywhere.

 ![Dropping widgets](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/preview-dragndrop.png)
@@ -65,7 +79,7 @@ If this flag is cleared, the widget resizing is deferred until the mouse button

 ### Opaque and non-opaque undocking

-By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediately. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediately. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key.
+By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediatelly. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediatelly. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key.

 The drag preview widget can be configured by a number of global dock manager flags:

@@ -92,10 +106,3 @@ You can detach dock widgets and also dock areas in the following ways:
 ### Supports deletion of dynamically created dock widgets

 Normally clicking the close button of a dock widget will just hide the widget and the user can show it again using the toggleView() action of the dock widget. This is meant for user interfaces with a static amount of widgets. But the advanced docking system also supports dynamic dock widgets that will get deleted on close. If you set the dock widget flag `DockWidgetDeleteOnClose` for a certain dock widget, then it will be deleted as soon as you close this dock widget. This enables the implementation of user interfaces with dynamically created editors, like in word processing applications or source code development tools.
-
-### Python PyQt5 Bindings
-
-![Python Logo](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/python_logo.png)
-
-The Advanced Docking System comes with a complete Python integration based on
-PyQt5 bindings. The package is available via [conda-forge](https://github.com/conda-forge/pyqtads-feedstock).
--- a/doc/ads_qt_marketplace_manifest.json
+++ b/doc/ads_qt_marketplace_manifest.json
@@ -4,21 +4,21 @@
    "extensionType": [
        "library"
    ],
-    "version": "3.8.2",
+    "version": "3.0.0",
    "vendor": {
        "name": "githubuser0xFFFF",
        "url": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System"
    },
    "contact": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues",
-    "icon": "https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/ads_icon.svg",
+    "icon": "https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/ads_icon_512.png",
    "licenses": [
-      { "licenseType": "LGPL-2.1-only",
+      { "licenseType": "LGPLv2.1",
        "licenseUrl": "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" }
    ],
    "created": "2017-03-30",
-    "lastUpdate": "2022-03-02",
+    "lastUpdate": "2020-01-16",
    "platforms": [
-        "Windows 7-11", "Kubuntu 18.04", "Kubuntu 19.10", "Ubuntu 19.10", "Ubuntu 20.04"
+        "Windows 7-10", "Kubuntu 18.04", "Kubuntu 19.10", "Ubuntu 19.10"
    ],
    "qtVersions": [
        "5.5.1 or newer"
--- a/doc/autohide-feature-demo.png
+++ b/doc/autohide-feature-demo.png
--- a/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_false.gif
+++ b/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_false.gif
--- a/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_true.gif
+++ b/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_true.gif
--- a/doc/cfg_flag_AutoHideHasCloseButton.png
+++ b/doc/cfg_flag_AutoHideHasCloseButton.png
--- a/doc/cfg_flag_AutoHideHasMinimizeButton.png
+++ b/doc/cfg_flag_AutoHideHasMinimizeButton.png
--- a/doc/cfg_flag_AutoHideOpenOnDragHover.gif
+++ b/doc/cfg_flag_AutoHideOpenOnDragHover.gif
--- a/doc/cfg_flag_AutoHideSideBarsIconOnly_false.png
+++ b/doc/cfg_flag_AutoHideSideBarsIconOnly_false.png
--- a/doc/cfg_flag_AutoHideSideBarsIconOnly_true.png
+++ b/doc/cfg_flag_AutoHideSideBarsIconOnly_true.png
--- a/doc/cfg_flag_DisableTabTextEliding_false.png
+++ b/doc/cfg_flag_DisableTabTextEliding_false.png
--- a/doc/cfg_flag_DisableTabTextEliding_true.png
+++ b/doc/cfg_flag_DisableTabTextEliding_true.png
--- a/doc/cfg_flag_DockAreaHasAutoHideButton.png
+++ b/doc/cfg_flag_DockAreaHasAutoHideButton.png
--- a/doc/cfg_flag_MiddleMouseButtonClosesTab.gif
+++ b/doc/cfg_flag_MiddleMouseButtonClosesTab.gif
--- a/doc/cfg_flag_ShowTabTextOnlyForActiveTab_true.png
+++ b/doc/cfg_flag_ShowTabTextOnlyForActiveTab_true.png
--- a/doc/cfg_flag_TabsAtBottom.png
+++ b/doc/cfg_flag_TabsAtBottom.png
--- a/doc/cfg_flag_TabsAtBottom_true.png
+++ b/doc/cfg_flag_TabsAtBottom_true.png
--- a/doc/showcase_adtf.png
+++ b/doc/showcase_adtf.png
--- a/doc/showcase_d-tect-x.png
+++ b/doc/showcase_d-tect-x.png
--- a/doc/showcase_dream3d_nx.png
+++ b/doc/showcase_dream3d_nx.png
--- a/doc/showcase_labplot.png
+++ b/doc/showcase_labplot.png
--- a/doc/showcase_metgem.png
+++ b/doc/showcase_metgem.png
--- a/doc/showcase_notepad_next.png
+++ b/doc/showcase_notepad_next.png
--- a/doc/showcase_plot_juggler.png
+++ b/doc/showcase_plot_juggler.png
--- a/doc/showcase_pre_workbench.png
+++ b/doc/showcase_pre_workbench.png
--- a/doc/showcase_pysoworks.png
+++ b/doc/showcase_pysoworks.png
--- a/doc/showcase_qmix_elements.png
+++ b/doc/showcase_qmix_elements.png
--- a/doc/showcase_qt_design_studio_video.png
+++ b/doc/showcase_qt_design_studio_video.png
--- a/doc/showcase_ramses_composer.png
+++ b/doc/showcase_ramses_composer.png
--- a/doc/showcase_resinsight.png
+++ b/doc/showcase_resinsight.png
--- a/Show More
+++ b/Show More