Skip to content

Commit e974cd5

Browse files
davidbannondavidbannon
committed
update to 6.2.4
1 parent fd260fc commit e974cd5

File tree

9 files changed

+45
-50
lines changed

9 files changed

+45
-50
lines changed

‎README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,30 @@ Upload the packages, do the git stuff !
137137

138138

139139

140+
**Another Approach (Experimental)**
141+
--------
142+
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.
143+
144+
* Build a U2004 VM, bring it up to date
145+
146+
* Add the Qt6.2.2 PPA -
147+
148+
* sudo add-apt-repository ppa:okirby/qt6-backports; sudo apt update;
149+
150+
* sudo apt install qt6-base-dev build-essential libgl1-mesa-dev rpm lintian devscripts vim
151+
152+
* Then, pull down a git copy of this repo into ~/Pascal
153+
154+
* Run the script, qt6update.bash in the above, ~/Pascal/cbindings/package/scripts - it will update the ~/Pascal/libqt6pas source tree (if necessary).
155+
156+
* cd down into the ~/Pascal/libqt6pas/cbindings and run qmake6; make to build the library, slow !
157+
158+
* cd down into packages and run the script package-lib, it should build the packages for you.
159+
160+
161+
162+
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.
163+
140164

141165

142166

‎README.note‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,31 @@ Then copy the resulting library back somewhere where it can be used on build the
7676
Upload the packages, do the git stuff !
7777

7878

79+
<size:large><bold>Another Approach (Experimental)</bold></size:large>
80+
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.
81+
<list><list-item dir="ltr">Build a U2004 VM, bring it up to date</list-item></list>
82+
<list><list-item dir="ltr">Add the Qt6.2.2 PPA -</list-item></list>
83+
<list><list-item dir="ltr">sudo add-apt-repository ppa:okirby/qt6-backports; sudo apt update;</list-item></list>
84+
<list><list-item dir="ltr">sudo apt install qt6-base-dev build-essential libgl1-mesa-dev rpm lintian devscripts vim</list-item></list>
85+
<list><list-item dir="ltr">Then, pull down a git copy of this repo into ~/Pascal</list-item></list>
86+
<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>
87+
<list><list-item dir="ltr">cd down into the ~/Pascal/libqt6pas/cbindings and run qmake6; make to build the library, slow !</list-item></list>
88+
<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>
89+
90+
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.
7991

8092

8193

8294

8395
</note-content></text>
84-
<last-change-date>2022-11-25T16:14:36.9003720+11:00</last-change-date>
85-
<last-metadata-change-date>2022-11-25T16:14:36.9003720+11:00</last-metadata-change-date>
96+
<last-change-date>2022-12-22T22:05:52.2319659+11:00</last-change-date>
97+
<last-metadata-change-date>2022-12-22T22:05:52.2319659+11:00</last-metadata-change-date>
8698
<create-date>2022-11-08T13:46:34.2510486+11:00</create-date>
8799
<cursor-position>1</cursor-position>
88100
<selection-bound-position>1</selection-bound-position>
89101
<width>1000</width>
90102
<height>626</height>
91-
<x>204</x>
92-
<y>45</y>
103+
<x>137</x>
104+
<y>29</y>
93105
<open-on-startup>False</open-on-startup>
94106
</note>

‎cbindings/Qt6Pas.pro‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111

1212

13-
# Binding Release Version 6.2.3 against Qt6 6.2 LTS release.
13+
# Binding Release Version 6.2.4 against Qt6 6.2 LTS release.
1414

15-
win32:VERSION = 6.2.3.0
16-
else:VERSION = 6.2.3
15+
win32:VERSION = 6.2.4.0
16+
else:VERSION = 6.2.4
1717
VER_MAJ = 6
1818
VER_MIN = 2
19-
VER_PAT = 3
19+
VER_PAT = 4
2020
win32:VERSION_PE_HEADER = 6.2
2121

2222
QT += gui printsupport

‎cbindings/package/scripts/qt6update.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66
# checks version number and if required, updates the relevent files.
77
# No license, use as you see fit. David Bannon 2022-12-17
88

9-
GIT_REPO="libqt6pas"
9+
GIT_REPO="Pascal/libqt6pas"
1010
DOWNLOAD="lazarus-main-lcl-interfaces-qt6"
1111
DOWNLOAD_SUBS="lcl/interfaces/qt6"
1212
TAR_FILE="lazarus-main-lcl-interfaces-qt6-cbindings-src.tar.gz"

‎cbindings/qt62.pas‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,10 +2604,6 @@ procedure QAbstractEventDispatcher_closingDown(handle: QAbstractEventDispatcherH
26042604
procedure QAbstractEventDispatcher_installNativeEventFilter(handle: QAbstractEventDispatcherH; filterObj: QAbstractNativeEventFilterH); cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_installNativeEventFilter';
26052605
procedure QAbstractEventDispatcher_removeNativeEventFilter(handle: QAbstractEventDispatcherH; filterObj: QAbstractNativeEventFilterH); cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_removeNativeEventFilter';
26062606
function QAbstractEventDispatcher_filterNativeEvent(handle: QAbstractEventDispatcherH; eventType: QByteArrayH; message: Pointer; result: PLong): Boolean; cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_filterNativeEvent';
2607-
{$ifdef MSWINDOWS }
2608-
function QAbstractEventDispatcher_registerEventNotifier(handle: QAbstractEventDispatcherH; notifier: QWinEventNotifierH): Boolean; cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_registerEventNotifier';
2609-
procedure QAbstractEventDispatcher_unregisterEventNotifier(handle: QAbstractEventDispatcherH; notifier: QWinEventNotifierH); cdecl; external Qt6PasLib name 'QAbstractEventDispatcher_unregisterEventNotifier';
2610-
{$endif}
26112607

26122608
function QMimeData_Create(): QMimeDataH; cdecl; external Qt6PasLib name 'QMimeData_Create';
26132609
procedure QMimeData_Destroy(handle: QMimeDataH); cdecl; external Qt6PasLib name 'QMimeData_Destroy';
@@ -8080,10 +8076,6 @@ procedure QPrinter_setPrintRange(handle: QPrinterH; range: QPrinterPrintRange);
80808076
function QPrinter_printRange(handle: QPrinterH): QPrinterPrintRange; cdecl; external Qt6PasLib name 'QPrinter_printRange';
80818077
procedure QPrinter_setPageMargins(handle: QPrinterH; left: qreal; top: qreal; right: qreal; bottom: qreal; _unit: QPrinterUnit); cdecl; external Qt6PasLib name 'QPrinter_setPageMargins';
80828078
procedure QPrinter_getPageMargins(handle: QPrinterH; left: PQReal; top: PQReal; right: PQReal; bottom: PQReal; _unit: QPrinterUnit); cdecl; external Qt6PasLib name 'QPrinter_getPageMargins';
8083-
{$ifdef MSWINDOWS }
8084-
procedure QPrinter_setWinPageSize(handle: QPrinterH; winPageSize: Integer); cdecl; external Qt6PasLib name 'QPrinter_setWinPageSize';
8085-
function QPrinter_winPageSize(handle: QPrinterH): Integer; cdecl; external Qt6PasLib name 'QPrinter_winPageSize';
8086-
{$endif}
80878079

80888080
function QPrinterInfo_Create(): QPrinterInfoH; cdecl; external Qt6PasLib name 'QPrinterInfo_Create';
80898081
procedure QPrinterInfo_Destroy(handle: QPrinterInfoH); cdecl; external Qt6PasLib name 'QPrinterInfo_Destroy';

‎cbindings/src/qabstracteventdispatcher_c.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,3 @@ bool QAbstractEventDispatcher_filterNativeEvent(QAbstractEventDispatcherH handle
9191
return (bool) ((QAbstractEventDispatcher *)handle)->filterNativeEvent(*(const QByteArray*)eventType, message, result);
9292
}
9393

94-
#if defined MSWINDOWS
95-
bool QAbstractEventDispatcher_registerEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier)
96-
{
97-
return (bool) ((QAbstractEventDispatcher *)handle)->registerEventNotifier((QWinEventNotifier*)notifier);
98-
}
99-
100-
void QAbstractEventDispatcher_unregisterEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier)
101-
{
102-
((QAbstractEventDispatcher *)handle)->unregisterEventNotifier((QWinEventNotifier*)notifier);
103-
}
104-
105-
#endif

‎cbindings/src/qabstracteventdispatcher_c.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,5 @@ C_EXPORT void QAbstractEventDispatcher_closingDown(QAbstractEventDispatcherH han
3131
C_EXPORT void QAbstractEventDispatcher_installNativeEventFilter(QAbstractEventDispatcherH handle, QAbstractNativeEventFilterH filterObj);
3232
C_EXPORT void QAbstractEventDispatcher_removeNativeEventFilter(QAbstractEventDispatcherH handle, QAbstractNativeEventFilterH filterObj);
3333
C_EXPORT bool QAbstractEventDispatcher_filterNativeEvent(QAbstractEventDispatcherH handle, const QByteArrayH eventType, void* message, long* result);
34-
#if defined MSWINDOWS
35-
C_EXPORT bool QAbstractEventDispatcher_registerEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier);
36-
C_EXPORT void QAbstractEventDispatcher_unregisterEventNotifier(QAbstractEventDispatcherH handle, QWinEventNotifierH notifier);
37-
#endif
3834

3935
#endif

‎cbindings/src/qprinter_c.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -363,15 +363,3 @@ void QPrinter_setPageSize(QPrinterH handle, const QPageSizeH pageSize)
363363
}
364364

365365

366-
#if defined MSWINDOWS
367-
void QPrinter_setWinPageSize(QPrinterH handle, int winPageSize)
368-
{
369-
((QPrinter *)handle)->setWinPageSize(winPageSize);
370-
}
371-
372-
int QPrinter_winPageSize(QPrinterH handle)
373-
{
374-
return (int) ((QPrinter *)handle)->winPageSize();
375-
}
376-
377-
#endif

‎cbindings/src/qprinter_c.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,4 @@ C_EXPORT void QPrinter_pageSize(QPrinterH handle, QPageSizeH retval);
8484
C_EXPORT void QPrinter_setPageLayout(QPrinterH handle, const QPageLayoutH pageLayout);
8585
C_EXPORT void QPrinter_setPageSize(QPrinterH handle, const QPageSizeH pageSize);
8686

87-
#if defined MSWINDOWS
88-
C_EXPORT void QPrinter_setWinPageSize(QPrinterH handle, int winPageSize);
89-
C_EXPORT int QPrinter_winPageSize(QPrinterH handle);
90-
#endif
91-
9287
#endif

0 commit comments

Comments
 (0)