release 6.2.6

Author: davidbannon

.github/workflows/test4update.yml

@@ -5,7 +5,8 @@ name: Test4Updates Qt6
 on:
   schedule:
   # This is UTC in crontab format, minutes hours etc....
-    - cron: '35 10,22 * * *' 
+    - cron: '35 10 * * *' 
+  # - cron: '35 10,22 * * *'     # no, twice a day is silly, I cannot respond that quickly.
   #workflow_dispatch
 
 #  issues:

README.md

@@ -15,31 +15,31 @@ README
 
 
 
-**NOTE : If you have libraries installed earlier than November 25, earlier than libqt6pas6_6.2.2-2_amd64.deb then you MUST remove the old before installing the new ones (if and only if you need the new ones). See below section Names and Numbering.**
+**NOTE : If you have libraries installed earlier than November 25, 2022, earlier than libqt6pas6_6.2.2-2_amd64.deb then you MUST remove the old before installing the new ones (if and only if you need the new ones). See below section Names and Numbering.**
 
 
 
 Download packaged libraries (Debs, RPMs and a tar ball) for x86_64 from https://github.com/davidbannon/libqt6pas/releases/latest
 
 
 
-The packages should work on distributions like Ubuntu 21.10, Fedora 35 and RH EL9.  Note that ones like Debian Bullseye, Ubuntu 20.04 for example will not work with these libraries, their official repos do not have  Qt6. In paractis, you need a Qt6 6.2.3 and GLibc 2.34 or later. But there are no guarantees folks !
+The packages should work on distributions like Ubuntu 21.10, Fedora 35 and RH EL9 and Debian Bookworm.  Note that ones like Ubuntu 20.04 for example will not work with these libraries, their official repos do not have  Qt6. In practise, you need a Qt6 6.2.3 and GLibc 2.34 or later. But there are no guarantees folks ! Bookworm appears to have settled on Qt6 6.4.2
 
 
 
-Its possible libraries pacman and for arm and arm64 will appear in the not too distant future.
+Its possible that libraries for pacman and for arm and arm64 will appear here if there seems a demand.
 
 
 
-libqt6pas is an interface between Lazarus and the Qt5 libraries.  Not all Qt6 functions are available, only those necessary for Lazarus functionality. See https://wiki.freepascal.org/Qt6_Interface
+libqt6pas is an interface between Lazarus and the Qt6 libraries.  Not all Qt6 functions are available, only those necessary for Lazarus functionality. See https://wiki.freepascal.org/Qt6_Interface
 
 
 
 This is an unofficial copy of the libqt6pas code from the Lazarus Main (aka Trunk, master). It is very new, should be regarded as experimental but does appear to work ! At some point in time, the distros will catch up and, if you can, you should use a distro distributed verion of the library. However, its possible that the libraries here will often be ahead of your distro.
 
 
 
-The code here will never be ahead of that in the Lazarus trunk but will track it, superficially tested as changes are made to the relevant content in Lazarus Main.
+The code here will never be ahead of that inthe Lazarus trunk but will track it, superficially tested as changes are made to the relevant content in Lazarus Main.
 
 
 
@@ -137,7 +137,7 @@ Upload the packages, do the git stuff !
 
 
 
-**Another Approach (Experimental)**
+**Another Approach, in fact, how its donw now !**
 --------
 By using an experimental PPA we can install Qt6.2.2 (not 6.2.3) on a U2004 so, avoid the dreaded libc and get a Qt6 almost exactly as Zeljko want. So far, seems to work. This model is a credit to **salvadorbs** who worked out how to do this as a github action.
 
@@ -149,20 +149,20 @@ By using an experimental PPA we can install Qt6.2.2 (not 6.2.3) on a U2004 so, a
 
  * sudo apt install qt6-base-dev build-essential libgl1-mesa-dev rpm lintian devscripts vim
 
-* Then, pull down a git copy of this repo into ~/Pascal
+* Then, pull down (or refresh) a git copy of this repo into ~/Pascal  (ie /home/$USER/Pascal/libqt6pas)
 
-* Run the script,  qt6update.bash in the above, ~/Pascal/cbindings/package/scripts - it will update the ~/Pascal/libqt6pas source tree (if necessary).
+* Run the script,  qt6update.bash in the above, ~/Pascal/cbindings/package/scripts directory from the user's home dir. This will update the ~/Pascal/libqt6pas source tree (if necessary).
 
 * cd down into the ~/Pascal/libqt6pas/cbindings and run qmake6; make to build the library, slow !
 
 * cd down into packages and run the script package-lib, it should build the packages for you.
 
 
 
-Now, push the changes you made to the source earlier up to github, create a new release page and git it an appropriate version tag. Upload the files.
+Now, push the changes you made to the source earlier back up to github, create a new release page and git it an appropriate version tag. Upload the files.
+
 
 
-Must update every 60 days to keep workflow running.
 
 
 

README.note

@@ -10,19 +10,19 @@
 
 <bold>Please Note :</bold> you probably don't need these files unless you are using Lazarus Main and Qt6. Several LTS distros will not have a viable Qt6 at present.
 
-<bold>NOTE : If you have libraries installed earlier than November 25, earlier than libqt6pas6_6.2.2-2_amd64.deb then you MUST remove the old before installing the new ones (if and only if you need the new ones). See below section Names and Numbering.</bold>
+<bold>NOTE : If you have libraries installed earlier than November 25, 2022, earlier than libqt6pas6_6.2.2-2_amd64.deb then you MUST remove the old before installing the new ones (if and only if you need the new ones). See below section Names and Numbering.</bold>
 
 Download packaged libraries (Debs, RPMs and a tar ball) for x86_64 from https://github.com/davidbannon/libqt6pas/releases/latest
 
-The packages should work on distributions like Ubuntu 21.10, Fedora 35 and RH EL9.  Note that ones like Debian Bullseye, Ubuntu 20.04 for example will not work with these libraries, their official repos do not have  Qt6. In paractis, you need a Qt6 6.2.3 and GLibc 2.34 or later. But there are no guarantees folks !
+The packages should work on distributions like Ubuntu 21.10, Fedora 35 and RH EL9 and Debian Bookworm.  Note that ones like Ubuntu 20.04 for example will not work with these libraries, their official repos do not have  Qt6. In practise, you need a Qt6 6.2.3 and GLibc 2.34 or later. But there are no guarantees folks ! Bookworm appears to have settled on Qt6 6.4.2
 
-Its possible libraries pacman and for arm and arm64 will appear in the not too distant future.
+Its possible that libraries for pacman and for arm and arm64 will appear here if there seems a demand.
 
-libqt6pas is an interface between Lazarus and the Qt5 libraries.  Not all Qt6 functions are available, only those necessary for Lazarus functionality. See https://wiki.freepascal.org/Qt6_Interface
+libqt6pas is an interface between Lazarus and the Qt6 libraries.  Not all Qt6 functions are available, only those necessary for Lazarus functionality. See https://wiki.freepascal.org/Qt6_Interface
 
 This is an unofficial copy of the libqt6pas code from the Lazarus Main (aka Trunk, master). It is very new, should be regarded as experimental but does appear to work ! At some point in time, the distros will catch up and, if you can, you should use a distro distributed verion of the library. However, its possible that the libraries here will often be ahead of your distro.
 
-The code here will never be ahead of that in the Lazarus trunk but will track it, superficially tested as changes are made to the relevant content in Lazarus Main.
+The code here will never be ahead of that inthe Lazarus trunk but will track it, superficially tested as changes are made to the relevant content in Lazarus Main.
 
 Bug reports about the library itself should be submitted to the normal Lazarus bug tracking system, https://gitlab.com/groups/freepascal.org/lazarus/-/issues
 
@@ -76,25 +76,25 @@ Then copy the resulting library back somewhere where it can be used on build the
 Upload the packages, do the git stuff !
 
 
-<size:large><bold>Another Approach (Experimental)</bold></size:large>
+<size:large><bold>Another Approach, in fact, how its donw now !</bold></size:large>
 By using an experimental PPA we can install Qt6.2.2 (not 6.2.3) on a U2004 so, avoid the dreaded libc and get a Qt6 almost exactly as Zeljko want. So far, seems to work. This model is a credit to <bold>salvadorbs</bold> who worked out how to do this as a github action.
 <list><list-item dir="ltr">Build a U2004 VM, bring it up to date</list-item></list>
 <list><list-item dir="ltr">Add the Qt6.2.2 PPA -</list-item></list>
 <list><list-item dir="ltr">sudo add-apt-repository ppa:okirby/qt6-backports; sudo apt update;</list-item></list>
  <list><list-item dir="ltr">sudo apt install qt6-base-dev build-essential libgl1-mesa-dev rpm lintian devscripts vim</list-item></list>
-<list><list-item dir="ltr">Then, pull down a git copy of this repo into ~/Pascal</list-item></list>
-<list><list-item dir="ltr">Run the script,  qt6update.bash in the above, ~/Pascal/cbindings/package/scripts - it will update the ~/Pascal/libqt6pas source tree (if necessary).</list-item></list>
+<list><list-item dir="ltr">Then, pull down (or refresh) a git copy of this repo into ~/Pascal  (ie /home/$USER/Pascal/libqt6pas)</list-item></list>
+<list><list-item dir="ltr">Run the script,  qt6update.bash in the above, ~/Pascal/cbindings/package/scripts directory from the user's home dir. This will update the ~/Pascal/libqt6pas source tree (if necessary).</list-item></list>
 <list><list-item dir="ltr">cd down into the ~/Pascal/libqt6pas/cbindings and run qmake6; make to build the library, slow !</list-item></list>
 <list><list-item dir="ltr">cd down into packages and run the script package-lib, it should build the packages for you.</list-item></list>
 
-Now, push the changes you made to the source earlier up to github, create a new release page and git it an appropriate version tag. Upload the files.
+Now, push the changes you made to the source earlier back up to github, create a new release page and git it an appropriate version tag. Upload the files.
 
 
 
 
 </note-content></text>
-  <last-change-date>2022-12-22T22:05:52.2319659+11:00</last-change-date>
-  <last-metadata-change-date>2022-12-22T22:05:52.2319659+11:00</last-metadata-change-date>
+  <last-change-date>2023-06-14T17:42:11.7527471+10:00</last-change-date>
+  <last-metadata-change-date>2023-06-14T17:42:11.7527471+10:00</last-metadata-change-date>
   <create-date>2022-11-08T13:46:34.2510486+11:00</create-date>
   <cursor-position>1</cursor-position>
   <selection-bound-position>1</selection-bound-position>

cbindings/Qt6Pas.pro

@@ -10,13 +10,13 @@
 
 
 
-# Binding Release Version 6.2.5 against Qt6 6.2 LTS release.
+# Binding Release Version 6.2.6 against Qt6 6.2 LTS release.
 
-win32:VERSION = 6.2.5.0
-else:VERSION = 6.2.5
+win32:VERSION = 6.2.6.0
+else:VERSION = 6.2.6
 VER_MAJ = 6
 VER_MIN = 2
-VER_PAT = 5
+VER_PAT = 6
 win32:VERSION_PE_HEADER = 6.2
 
 QT += gui printsupport

cbindings/qt62.pas

@@ -2565,6 +2565,9 @@ function QTranslator_load(handle: QTranslatorH; filename: PWideString; directory
 function QTranslator_load(handle: QTranslatorH; locale: QLocaleH; filename: PWideString; prefix: PWideString = nil; directory: PWideString = nil; suffix: PWideString = nil): Boolean; cdecl; external Qt6PasLib name 'QTranslator_load2';
 function QTranslator_load(handle: QTranslatorH; data: PByte; len: Integer; directory: PWideString = nil): Boolean; cdecl; external Qt6PasLib name 'QTranslator_load3';
 
+type
+  QTimer_timeout_Event = procedure () of object cdecl;
+
 function QTimer_Create(parent: QObjectH = nil): QTimerH; cdecl; external Qt6PasLib name 'QTimer_Create';
 procedure QTimer_Destroy(handle: QTimerH); cdecl; external Qt6PasLib name 'QTimer_Destroy'; 
 function QTimer_isActive(handle: QTimerH): Boolean; cdecl; external Qt6PasLib name 'QTimer_isActive';
@@ -2578,14 +2581,13 @@ procedure QTimer_setSingleShot(handle: QTimerH; singleShot: Boolean); cdecl; ext
 function QTimer_isSingleShot(handle: QTimerH): Boolean; cdecl; external Qt6PasLib name 'QTimer_isSingleShot';
 procedure QTimer_singleShot(msec: Integer; receiver: QObjectH; member: PAnsiChar); cdecl; external Qt6PasLib name 'QTimer_singleShot';
 procedure QTimer_singleShot(msec: Integer; timerType: QtTimerType; receiver: QObjectH; member: PAnsiChar); cdecl; external Qt6PasLib name 'QTimer_singleShot2';
+procedure QTimer_singleShot(msec: Integer; timeoutEvent: QTimer_timeout_Event); cdecl; external Qt6PasLib name 'QTimer_singleShot3';
+procedure QTimer_singleShot(msec: Integer; context: QObjectH; timeoutEvent: QTimer_timeout_Event); cdecl; external Qt6PasLib name 'QTimer_singleShot4';
 procedure QTimer_start(handle: QTimerH; msec: Integer); cdecl; external Qt6PasLib name 'QTimer_start';
 procedure QTimer_start(handle: QTimerH); cdecl; external Qt6PasLib name 'QTimer_start2';
 procedure QTimer_stop(handle: QTimerH); cdecl; external Qt6PasLib name 'QTimer_stop';
 
 
-type
-  QTimer_timeout_Event = procedure () of object cdecl;
-
 
 function QAbstractEventDispatcher_instance(thread: QThreadH = nil): QAbstractEventDispatcherH; cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_instance';
 function QAbstractEventDispatcher_processEvents(handle: QAbstractEventDispatcherH; flags: QEventLoopProcessEventsFlags): Boolean; cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_processEvents';

cbindings/src/qthread_c.cpp

@@ -1,5 +1,5 @@
 //******************************************************************************
-//  Copyright (c) 2005-2013 by Jan Van hijfte
+//  Copyright (c) 2005-2023 by Jan Van hijfte, Željan Rikalo
 //
 //  See the included file COPYING.TXT for details about the copyright.
 //
@@ -111,6 +111,21 @@ bool QThread_wait(QThreadH handle, unsigned long time)
 	return (bool) ((QThread *)handle)->wait(time);
 }
 
+bool QThread_isInterruptionRequested(QThreadH handle)
+{
+  return (bool) ((QThread *)handle)->isInterruptionRequested();
+}
+
+void QThread_requestInterruption(QThreadH handle)
+{
+  ((QThread *)handle)->requestInterruption();
+}
+
+int QThread_loopLevel(QThreadH handle)
+{
+  return (int) ((QThread *)handle)->loopLevel();
+}
+
 void QThread_sleep(unsigned long AnonParam1)
 {
 	QThread::sleep(AnonParam1);

cbindings/src/qthread_c.h

@@ -1,5 +1,5 @@
 //******************************************************************************
-//  Copyright (c) 2005-2013 by Jan Van hijfte
+//  Copyright (c) 2005-2023 by Jan Van hijfte, Željan Rikalo
 //
 //  See the included file COPYING.TXT for details about the copyright.
 //
@@ -35,6 +35,9 @@ C_EXPORT void QThread_start(QThreadH handle, QThread::Priority AnonParam1);
 C_EXPORT void QThread_terminate(QThreadH handle);
 C_EXPORT void QThread_quit(QThreadH handle);
 C_EXPORT bool QThread_wait(QThreadH handle, unsigned long time);
+C_EXPORT bool QThread_isInterruptionRequested(QThreadH handle);
+C_EXPORT void QThread_requestInterruption(QThreadH handle);
+C_EXPORT int QThread_loopLevel(QThreadH handle);
 C_EXPORT void QThread_sleep(unsigned long AnonParam1);
 C_EXPORT void QThread_msleep(unsigned long AnonParam1);
 C_EXPORT void QThread_usleep(unsigned long AnonParam1);

cbindings/src/qtimer_c.cpp

@@ -1,5 +1,5 @@
 //******************************************************************************
-//  Copyright (c) 2005-2013 by Jan Van hijfte
+//  Copyright (c) 2005-2023 by Jan Van hijfte, Željan Rikalo
 //
 //  See the included file COPYING.TXT for details about the copyright.
 //
@@ -76,6 +76,16 @@ void QTimer_singleShot2(int msec, Qt::TimerType timerType, const QObjectH receiv
 	QTimer::singleShot(msec, timerType, (const QObject*)receiver, member);
 }
 
+void QTimer_singleShot3(int msec, void (*TimeoutEvent)())
+{
+  QTimer::singleShot(msec, TimeoutEvent);
+}
+
+void QTimer_singleShot4(int msec, const QObjectH context, void (*TimeoutEvent)())
+{
+  QTimer::singleShot(msec, (const QObject*)context, TimeoutEvent);
+}
+
 void QTimer_start(QTimerH handle, int msec)
 {
 	((QTimer *)handle)->start(msec);

cbindings/src/qtimer_c.h

@@ -1,5 +1,5 @@
 //******************************************************************************
-//  Copyright (c) 2005-2013 by Jan Van hijfte
+//  Copyright (c) 2005-2023 by Jan Van hijfte, Željan Rikalo
 //
 //  See the included file COPYING.TXT for details about the copyright.
 //
@@ -28,6 +28,8 @@ C_EXPORT void QTimer_setSingleShot(QTimerH handle, bool singleShot);
 C_EXPORT bool QTimer_isSingleShot(QTimerH handle);
 C_EXPORT void QTimer_singleShot(int msec, const QObjectH receiver, const char* member);
 C_EXPORT void QTimer_singleShot2(int msec, Qt::TimerType timerType, const QObjectH receiver, const char* member);
+C_EXPORT void QTimer_singleShot3(int msec, void (*TimeoutEvent)());
+C_EXPORT void QTimer_singleShot4(int msec, const QObjectH context, void (*TimeoutEvent)());
 C_EXPORT void QTimer_start(QTimerH handle, int msec);
 C_EXPORT void QTimer_start2(QTimerH handle);
 C_EXPORT void QTimer_stop(QTimerH handle);