build: Updated Lazarus to 3.2 (#181)

salvadorbs · Mar 18, 2024 · d945f99 · d945f99
1 parent 8eeebc4
commit d945f99
Show file tree

Hide file tree

Showing 26 changed files with 133 additions and 120 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,12 +19,12 @@ env:
   FPC_URL: 'gitlab'
   FPC_BRANCH: 'release_3_2_2'
   LAZ_URL: 'gitlab'
-  LAZ_BRANCH: 'lazarus_2_2_4'
-  LAZ_REVISION_2_4: '0a3429053c0dfcae2359e3b0b62e1763d5e6a319'
+  LAZ_BRANCH: 'lazarus_3_2'
+  LAZ_REVISION_2_4: ''
   LAZ_DIR: 'fpcLaz'
   BUILD_MODE: 'Debug_GH_Action'   
   FPCUP_OPT: '--lazopt="-g -gl" --fpcopt="-g -gl"'
-  LAZ_PATCH: '/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
+  LAZ_PATCH: '' #'/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
   ASUITE_SOURCE: 'asuite_src'
 
 jobs:
@@ -44,7 +44,7 @@ jobs:
 
           - os: windows-latest
             name: 'Windows 64'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-win64.exe'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-win64.exe'
             lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
             dbg2mab: 'dbg2mab.exe'
             build-widgetset: 'win32'
@@ -53,7 +53,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK2'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk2'
@@ -62,7 +62,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK3'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk3'
@@ -71,7 +71,7 @@ jobs:
 
           - os: ubuntu-20.04
             name: 'Linux 64 QT5'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt5'
@@ -80,7 +80,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 QT6'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt6'
@@ -109,24 +109,22 @@ jobs:
     - name: Install Dependencies (Ubuntu - only QT5)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04') && matrix.config.build-widgetset == 'qt5'
       run: |
-        sudo apt-get -m -y install libqt5pas-dev libqt5pas1 qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev
-        cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
-        qmake
-        make
-        sudo make install
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas1_2.15-1_amd64.deb
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas-dev_2.15-1_amd64.deb
+        sudo apt-get update
+        sudo apt-get -m -y install qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev
+        sudo apt-get -m -y install ./libqt5pas1_2.15-1_amd64.deb
+        sudo apt-get -m -y install ./libqt5pas-dev_2.15-1_amd64.deb
         
     - name: Install Dependencies (Ubuntu - only QT6)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6'
       run: |
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_6.2.2-2_amd64.deb
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6-dev_6.2.2-2_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6_6.2.7-1_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6-dev_6.2.7-1_amd64.deb
+        sudo apt-get update
         sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev
-        sudo dpkg -i libqt6pas6_6.2.2-2_amd64.deb
-        sudo dpkg -i libqt6pas6-dev_6.2.2-2_amd64.deb
-        cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
-        qmake6
-        make
-        sudo make install
+        sudo apt-get -m -y install ./libqt6pas6_6.2.7-1_amd64.deb
+        sudo apt-get -m -y install ./libqt6pas6-dev_6.2.7-1_amd64.deb
 
     - name: Generate Cache Hash
       run: echo "${{ matrix.config.fpcup-url }}${{ env.FPCUP_OPT }}${{ env.FPC_URL }}${{ env.FPC_BRANCH }}${{ env.LAZ_URL }}${{ env.LAZ_BRANCH }}${{ env.LAZ_REVISION_2_4 }}${{ env.LAZ_PATCH}}${{ matrix.config.name }}" > .cache
@@ -135,23 +133,15 @@ jobs:
       id: cache
       uses: actions/[email protected]
       env:
-        cache-name: cache-laz-v0.6.0
+        cache-name: cache-laz-v0.6.1
       with:
         path: |
           ${{ env.LAZ_DIR }}
           ${{ env.ASUITE_SOURCE }}/3p/mORMot2/static
         key: ${{ runner.os }}-${{ env.cache-name }}_${{ matrix.config.build-widgetset }}-${{ hashFiles('.cache') }}     
 
     - name: Install Lazarus
-      if: steps.cache.outputs.cache-hit != 'true' && matrix.config.build-widgetset == 'qt6'
-      run: |
-        curl --retry 5 -L -o fpcup ${{ matrix.config.fpcup-url }}
-        chmod +x fpcup
-        mkdir ${{ env.LAZ_DIR }}
-        ./fpcup --installdir=${{ env.LAZ_DIR }} --fpcURL=${{ env.FPC_URL }} --fpcBranch=${{ env.FPC_BRANCH }} --lazURL=${{ env.LAZ_URL }} --lazRevision=${{ env.LAZ_REVISION_2_4 }} --lazPATCH="${{ env.ASUITE_SOURCE}}${{ env.LAZ_PATCH}}" ${{ env.FPCUP_OPT }} --only=docker --noconfirm --verbose
-
-    - name: Install Lazarus
-      if: steps.cache.outputs.cache-hit != 'true' && matrix.config.build-widgetset != 'qt6'
+      if: steps.cache.outputs.cache-hit != 'true'
       run: |
         curl --retry 5 -L -o fpcup ${{ matrix.config.fpcup-url }}
         chmod +x fpcup
@@ -168,10 +158,10 @@ jobs:
       run: ${{ matrix.config.lazbuild }} --version && echo "success=true" >> $GITHUB_OUTPUT || echo "success=false" >> $GITHUB_OUTPUT
 
     - name: Build ASuite (${{ env.BUILD_MODE }})
-      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/ASuite.lpi" --no-write-project --build-mode="${{ env.BUILD_MODE }}" --widgetset=${{ matrix.config.build-widgetset }} --operating-system=${{ matrix.config.build-os }}
+      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/ASuite.lpi" --no-write-project --build-mode="${{ env.BUILD_MODE }}" --widgetset=${{ matrix.config.build-widgetset }}
 
     - name: Build dbg2mab
-      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/3p/dbg2mab/dbg2mab.lpi" --no-write-project --widgetset=${{ matrix.config.build-widgetset }} --operating-system=${{ matrix.config.build-os }}
+      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/3p/dbg2mab/dbg2mab.lpi" --no-write-project --widgetset=${{ matrix.config.build-widgetset }}
 
     - name: Embedded debug info in asuite executable
       #if: matrix.config.build-widgetset != 'gtk2'
@@ -183,4 +173,3 @@ jobs:
         name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }}
         path: |
           ${{ env.ASUITE_SOURCE}}/bin
-          ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas/libQGHotkeyHookPas.so*
diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml
@@ -15,11 +15,12 @@ env:
   FPC_URL: 'gitlab'
   FPC_BRANCH: 'release_3_2_2'
   LAZ_URL: 'gitlab'
-  LAZ_BRANCH: 'lazarus_2_2_4'
+  LAZ_BRANCH: 'lazarus_3_2'
+  LAZ_REVISION_2_4: ''
   LAZ_DIR: 'fpcLaz'
-  BUILD_MODE: 'Release'   
-  FPCUP_OPT: ''
-  LAZ_PATCH: '/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
+  BUILD_MODE: 'Debug_GH_Action'   
+  FPCUP_OPT: '--lazopt="-g -gl" --fpcopt="-g -gl"'
+  LAZ_PATCH: '' #'/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
   ASUITE_SOURCE: 'asuite_src'
 
 jobs:
@@ -39,25 +40,25 @@ jobs:
 
           - os: windows-latest
             name: 'Windows 64'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0h/fpclazup-x86_64-win64.exe'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-win64.exe'
             lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
             dbg2mab: 'dbg2mab.exe'
             build-widgetset: 'win32'
             build-os: 'win64'
             debug_file: 'ASuite.dbg'
 
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             name: 'Linux 64 GTK2'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0h/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk2'
             build-os: 'linux'
             debug_file: 'ASuite.dbg'
 
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             name: 'Linux 64 GTK3'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0h/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk3'
@@ -66,54 +67,74 @@ jobs:
 
           - os: ubuntu-20.04
             name: 'Linux 64 QT5'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0h/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt5'
             build-os: 'linux'
             debug_file: 'ASuite.dbg'
 
+          - os: ubuntu-22.04
+            name: 'Linux 64 QT6'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            lazbuild: 'fpcLaz/lazarus/lazbuild'
+            dbg2mab: 'dbg2mab'
+            build-widgetset: 'qt6'
+            build-os: 'linux'
+            debug_file: 'ASuite.dbg'
+
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
         path: '${{ env.ASUITE_SOURCE }}'
 
     - name: Install Dependencies (Ubuntu)
-      if: matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04'
+      if: matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04' && matrix.config.build-widgetset == 'gtk2'
       run: |
         sudo apt-get update
         sudo apt-get -m -y install libgtk2.0-dev libpango1.0-dev libffi-dev libxtst-dev xvfb
         Xvfb :1 &
         
     - name: Install Dependencies (Ubuntu - only GTK3)
-      if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04') && matrix.config.build-widgetset == 'gtk3'
+      if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'gtk3'
       run: sudo apt-get -m -y install libgtk-3-dev
 
     - name: Install Dependencies (Ubuntu - only QT5)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04') && matrix.config.build-widgetset == 'qt5'
       run: |
-        sudo apt-get -m -y install libqt5pas-dev libqt5pas1 qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev
-        cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
-        qmake
-        make
-        sudo make install
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas1_2.15-1_amd64.deb
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas-dev_2.15-1_amd64.deb
+        sudo apt-get update
+        sudo apt-get -m -y install qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev
+        sudo apt-get -m -y install ./libqt5pas1_2.15-1_amd64.deb
+        sudo apt-get -m -y install ./libqt5pas-dev_2.15-1_amd64.deb
+        
+    - name: Install Dependencies (Ubuntu - only QT6)
+      if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6'
+      run: |
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6_6.2.7-1_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6-dev_6.2.7-1_amd64.deb
+        sudo apt-get update
+        sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev
+        sudo apt-get -m -y install ./libqt6pas6_6.2.7-1_amd64.deb
+        sudo apt-get -m -y install ./libqt6pas6-dev_6.2.7-1_amd64.deb
 
     - name: Generate Cache Hash
-      run: echo "${{ matrix.config.fpcup-url }}${{ env.FPCUP_OPT }}${{ env.FPC_URL }}${{ env.FPC_BRANCH }}${{ env.LAZ_URL }}${{ env.LAZ_BRANCH }}${{ env.LAZ_PATCH}}${{ matrix.config.name }}" > .cache
+      run: echo "${{ matrix.config.fpcup-url }}${{ env.FPCUP_OPT }}${{ env.FPC_URL }}${{ env.FPC_BRANCH }}${{ env.LAZ_URL }}${{ env.LAZ_BRANCH }}${{ env.LAZ_REVISION_2_4 }}${{ env.LAZ_PATCH}}${{ matrix.config.name }}" > .cache
 
     - name: Cache
       id: cache
-      uses: actions/cache@v2.1.3
+      uses: actions/cache@v3.0.11
       env:
-        cache-name: cache-laz-v0.5.4
+        cache-name: cache-laz-v0.6.1
       with:
         path: |
           ${{ env.LAZ_DIR }}
           ${{ env.ASUITE_SOURCE }}/3p/mORMot2/static
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('.cache') }}     
+        key: ${{ runner.os }}-${{ env.cache-name }}_${{ matrix.config.build-widgetset }}-${{ hashFiles('.cache') }}     
 
     - name: Install Lazarus
       if: steps.cache.outputs.cache-hit != 'true'
@@ -130,21 +151,21 @@ jobs:
 
     - name: Validate Cache
       if: steps.cache.outputs.cache-hit == 'true'
-      run: ${{ matrix.config.lazbuild }} --version && echo "::set-output name=success::true" || echo "::set-output name=success::false"
+      run: ${{ matrix.config.lazbuild }} --version && echo "success=true" >> $GITHUB_OUTPUT || echo "success=false" >> $GITHUB_OUTPUT
 
     - name: Build ASuite (${{ env.BUILD_MODE }})
-      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/ASuite.lpi" --no-write-project --build-mode="${{ env.BUILD_MODE }}" --widgetset=${{ matrix.config.build-widgetset }} --operating-system=${{ matrix.config.build-os }}
+      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/ASuite.lpi" --no-write-project --build-mode="${{ env.BUILD_MODE }}" --widgetset=${{ matrix.config.build-widgetset }}
 
     - name: Build dbg2mab
-      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/3p/dbg2mab/dbg2mab.lpi" --no-write-project --widgetset=${{ matrix.config.build-widgetset }} --operating-system=${{ matrix.config.build-os }}
+      run: ${{ matrix.config.lazbuild }} "${{ env.ASUITE_SOURCE }}/3p/dbg2mab/dbg2mab.lpi" --no-write-project --widgetset=${{ matrix.config.build-widgetset }}
 
     - name: Embedded debug info in asuite executable
+      #if: matrix.config.build-widgetset != 'gtk2'
       run: ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.dbg2mab }} ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.debug_file }}
 
     - name: Upload the Build Artifact
-      uses: actions/upload-artifact@v2.2.2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }}
         path: |
           ${{ env.ASUITE_SOURCE}}/bin
-          ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas/libQGHotkeyHookPas.so*
diff --git a/3p/AsuiteComps b/3p/AsuiteComps
diff --git a/3p/VirtualTreeView-Lazarus b/3p/VirtualTreeView-Lazarus
diff --git a/3p/bgrabitmap b/3p/bgrabitmap
diff --git a/3p/bgracontrols b/3p/bgracontrols
diff --git a/3p/mORMot2 b/3p/mORMot2
diff --git a/ASuite.lpi b/ASuite.lpi
@@ -17,7 +17,7 @@
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
       <XPManifest>
-        <DpiAware Value="True"/>
+        <DpiAware Value="True/PM_V2"/>
         <TextName Value="ASuite"/>
         <TextDesc Value="Portable Launcher"/>
       </XPManifest>
@@ -32,7 +32,7 @@
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="2"/>
       <MinorVersionNr Value="1"/>
-      <BuildNr Value="1652"/>
+      <BuildNr Value="1661"/>
     </VersionInfo>
     <BuildModes Count="3">
       <Item1 Name="Debug" Default="True"/>
@@ -594,7 +594,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <DebugInfoType Value="dsDwarf2Set"/>
+        <DebugInfoType Value="dsDwarf3"/>
         <UseHeaptrc Value="True"/>
         <TrashVariables Value="True"/>
       </Debugging>

diff --git a/ASuite.res b/ASuite.res
diff --git a/Forms/Forms.GraphicMenu.pas b/Forms/Forms.GraphicMenu.pas
@@ -132,7 +132,7 @@ implementation
 uses
   Forms.Main, Utility.System, Kernel.Consts, AppConfig.Main, DataModules.Icons,
   Forms.About, NodeDataTypes.Base, Kernel.Enumerations, Forms.Options, LazVersion,
-  Utility.Misc, VirtualTree.Methods, Kernel.Types,
+  Utility.Misc, VirtualTree.Methods, Kernel.Types, VirtualTrees.Types,
   NodeDataTypes.Custom, Kernel.ResourceStrings, Kernel.Instance, Kernel.Manager
   {$IFDEF MSWINDOWS} , Windows {$ENDIF};
 

diff --git a/Forms/Forms.ImportList.pas b/Forms/Forms.ImportList.pas
@@ -24,7 +24,7 @@
 interface
 
 uses
-  LCLIntf, SysUtils, Classes, Graphics, Controls, Forms,
+  LCLIntf, SysUtils, Classes, Graphics, Controls, Forms, VirtualTrees.Types,
   Dialogs, ExtCtrls, StdCtrls, ComCtrls, VirtualTrees, Kernel.Consts, DOM, XMLRead,
   Kernel.Enumerations, EditBtn;
 

diff --git a/Forms/Forms.Main.pas b/Forms/Forms.Main.pas
@@ -167,9 +167,9 @@ implementation
   Forms.Options, Forms.About, Utility.Misc, Forms.ScanFolder, Clipbrd,
   DataModules.TrayMenu, Forms.ImportList, AppConfig.Main, Utility.System,
   VirtualTree.Methods, Frame.Options.Stats, NodeDataTypes.Base,
-  Kernel.Types, NodeDataTypes.Files, Kernel.Manager,
-  Kernel.Logger, mormot.core.log, FileUtil, Kernel.ResourceStrings, Kernel.Instance
-  {$IFDEF MSWINDOWS} , jwatlhelp32, Windows {$ENDIF};
+  Kernel.Types, NodeDataTypes.Files, Kernel.Manager, VirtualTrees.Types,
+  Kernel.Logger, mormot.core.log, FileUtil, Kernel.ResourceStrings, Kernel.Instance,
+  VirtualTrees.ClipBoard {$IFDEF MSWINDOWS} , jwatlhelp32, Windows {$ENDIF};
 
 {$R *.lfm}
 

diff --git a/Forms/Forms.ScanFolder.pas b/Forms/Forms.ScanFolder.pas
@@ -25,7 +25,7 @@ interface
 
 uses
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, ExtCtrls, VirtualTrees, ComCtrls, ShellCtrls,
+  StdCtrls, ExtCtrls, VirtualTrees, ComCtrls, ShellCtrls, VirtualTrees.Types,
   ImgList, ButtonPanel, FileUtil, Thread.FindFiles, mormot.core.log;
 
 type

diff --git a/Frame/Frame.Options.Autorun.pas b/Frame/Frame.Options.Autorun.pas
@@ -24,7 +24,7 @@
 interface
 
 uses
-  LCLIntf, SysUtils, Classes, Controls, Dialogs, Frame.BaseEntity,
+  LCLIntf, SysUtils, Classes, Controls, Dialogs, Frame.BaseEntity, VirtualTrees.Types,
   StdCtrls, VirtualTrees, Lists.Base, Menus, ExtCtrls, Buttons, ActnList;
 
 type