Skip to content

Commit bde90c0

Browse files
ruben2020ruben2020
committed
Upgrade to Qt 6.9.0 for Windows
1 parent d7bf681 commit bde90c0

File tree

7 files changed

+258
-45
lines changed

7 files changed

+258
-45
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
steps:
8181
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
82-
- uses: actions/checkout@v3
82+
- uses: actions/checkout@v4
8383

8484
- name: Print env
8585
run: |

‎THIRDPARTY.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ License file: [querylib/getopt2.h](querylib/getopt2.h)
6060
Linking method: Static linking
6161
Distribution method: Included in CodeQuery binaries
6262

63+
winmain.cpp from gosu project
64+
-----------------------------
65+
Title: WinMain.cpp (gosu)
66+
Author: Julian Raschke, Jan Lücker, cyberarm, and all
67+
Source: https://github.com/gosu/gosu/blob/master/src/WinMain.cpp
68+
License: MIT
69+
License file: [gui/winmain.cpp](gui/winmain.cpp)
70+
Linking method: Static linking
71+
Distribution method: Included in CodeQuery binaries for Windows
72+
6373
showgraph
6474
---------
6575
Title: showgraph

‎gui/winmain.cpp‎

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ Taken from:
66
77
This license applies only to this file:
88
9-
Copyright (C) 2001-2017 Julian Raschke, Jan Lücker and all contributors.
9+
Copyright (C) 2001-2023 Julian Raschke, Jan Lücker, cyberarm, and all
10+
other contributors: https://github.com/gosu/gosu/graphs/contributors
1011
1112
Permission is hereby granted, free of charge, to any person obtaining a
1213
copy of this software and associated documentation files (the "Software"),
@@ -27,57 +28,51 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2728
DEALINGS IN THE SOFTWARE.
2829
2930
Julian Raschke <[email protected]> & contributors
30-
http://www.libgosu.org/
31+
https://www.libgosu.org/
3132
3233
*/
3334

34-
#ifdef _MSC_VER
35+
//#ifdef _MSC_VER
36+
#ifdef _WIN32
3537

36-
#include <windows.h>
3738
#include <exception>
3839
#include <string>
3940
#include <vector>
41+
#include <windows.h>
4042
using namespace std;
4143

42-
vector<string> splitCmdLine()
44+
vector<string> split_cmd_line()
4345
{
4446
vector<string> result;
4547

46-
const char* cmdLine = ::GetCommandLineA();
48+
const char* cmd_line = ::GetCommandLineA();
4749

48-
const char* argBegin = 0;
49-
bool isQuotedArg = false;
50+
const char* arg_begin = nullptr;
51+
bool is_quoted_arg = false;
5052

51-
while (*cmdLine)
52-
{
53-
if (*cmdLine == '"')
54-
{
55-
if (argBegin == 0)
56-
{
57-
argBegin = cmdLine + 1;
58-
isQuotedArg = true;
53+
while (*cmd_line) {
54+
if (*cmd_line == '"') {
55+
if (arg_begin == nullptr) {
56+
arg_begin = cmd_line + 1;
57+
is_quoted_arg = true;
5958
}
60-
else if (isQuotedArg)
61-
{
62-
result.push_back(std::string(argBegin, cmdLine));
63-
argBegin = 0;
59+
else if (is_quoted_arg) {
60+
result.push_back(string(arg_begin, cmd_line));
61+
arg_begin = nullptr;
6462
}
6563
}
66-
else if (!isspace((unsigned char)*cmdLine) && argBegin == 0)
67-
{
68-
argBegin = cmdLine;
69-
isQuotedArg = false;
64+
else if (!isspace((unsigned char)*cmd_line) && arg_begin == nullptr) {
65+
arg_begin = cmd_line;
66+
is_quoted_arg = false;
7067
}
71-
else if (isspace((unsigned char)*cmdLine) && argBegin != 0 && !isQuotedArg)
72-
{
73-
result.push_back(std::string(argBegin, cmdLine + 1));
74-
argBegin = 0;
68+
else if (isspace((unsigned char)*cmd_line) && arg_begin != nullptr && !is_quoted_arg) {
69+
result.push_back(string(arg_begin, cmd_line + 1));
70+
arg_begin = nullptr;
7571
}
76-
++cmdLine;
72+
++cmd_line;
7773
}
7874

79-
if (argBegin != 0)
80-
result.push_back(argBegin);
75+
if (arg_begin != 0) result.push_back(arg_begin);
8176

8277
return result;
8378
}
@@ -86,20 +81,18 @@ int main(int argc, char* argv[]);
8681

8782
int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
8883
{
89-
try
90-
{
91-
vector<string> arguments = splitCmdLine();
84+
try {
85+
vector<string> arguments = split_cmd_line();
9286
vector<char*> argv(arguments.size());
93-
for (unsigned i = 0; i < argv.size(); ++i)
87+
for (unsigned i = 0; i < argv.size(); ++i) {
9488
argv[i] = const_cast<char*>(arguments[i].c_str());
89+
}
9590
return main(argv.size(), &argv[0]);
9691
}
97-
catch (const std::exception& e)
98-
{
92+
catch (const exception& e) {
9993
::MessageBoxA(0, e.what(), "Uncaught Exception", MB_OK | MB_ICONERROR);
10094
return EXIT_FAILURE;
10195
}
10296
}
10397

10498
#endif
105-

‎windows-install/qt6/buildqt6.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ copy "%MinGW64_DIR%\bin\sqlite3.dll" output
88
cd output
99
windeployqt --release codequery.exe
1010
dir/b/a/s
11-
candle.exe -ext WixUIExtension -ext WixUtilExtension "c:\workspace\codequery\windows-install\qt6\codequeryqt671.wxs"
12-
light.exe -ext WixUIExtension -ext WixUtilExtension codequeryqt671.wixobj
11+
candle.exe -ext WixUIExtension -ext WixUtilExtension "c:\workspace\codequery\windows-install\qt6\codequeryqt690.wxs"
12+
light.exe -ext WixUIExtension -ext WixUtilExtension codequeryqt690.wixobj

‎windows-install/qt6/buildqt6_github.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aqt list-qt windows desktop
2-
aqt list-qt windows desktop --arch 6.7.1
3-
aqt list-qt windows desktop --modules 6.7.1 win64_mingw
2+
aqt list-qt windows desktop --arch 6.9.0
3+
aqt list-qt windows desktop --modules 6.9.0 win64_mingw
44
set PATH=%Qt6_DIR%/bin;%PATH%
55
cmake --version
66
gcc -v

‎windows-install/qt6/codequeryqt690.wxs‎

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
<?xml version='1.0' encoding='windows-1252'?>
2+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
3+
<Product Name='CodeQuery 1.0.0 (Qt6, 64-bit)' Manufacturer='ruben2020_foss'
4+
Id='*'
5+
UpgradeCode='2368ce2d-f635-4c8c-9b92-6fa348b292af'
6+
Language='1033' Codepage='1252' Version='1.0.0'>
7+
<Package Id='*' Keywords='Installer' Description="CodeQuery 1.0.0 (Qt6, 64-bit) Installer"
8+
Comments='Copyright 2013-2024 (C) ruben2020' Manufacturer='ruben2020_foss'
9+
InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252'
10+
Platform="x64" />
11+
<Condition Message="You need to be an administrator to install this product.">
12+
Privileged
13+
</Condition>
14+
<Condition Message='This application only runs on 64-bit Windows.'>
15+
VersionNT64
16+
</Condition>
17+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
18+
<WixVariable Id="WixUILicenseRtf" Value="..\..\windows-install\wincommon\LICENSE.rtf" />
19+
<WixVariable Id="WixUIBannerBmp" Value="..\..\doc\banner.bmp" />
20+
<WixVariable Id="WixUIDialogBmp" Value="..\..\doc\dialog.bmp" />
21+
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch 'How to use CodeQuery'" />
22+
<Property Id='NOTEPAD'>Notepad.exe</Property>
23+
<CustomAction Id='LaunchFile' Property='NOTEPAD' ExeCommand='[#HOWTO]' Return='asyncNoWait' />
24+
<Icon Id="codequery.ico" SourceFile="..\..\gui\images\codequery.ico" />
25+
<Icon Id="msiexec.ico" SourceFile="C:\Windows\System32\msiexec.exe" />
26+
<Property Id="ARPPRODUCTICON" Value="codequery.ico" />
27+
<UI>
28+
<UIRef Id="WixUI_InstallDir" />
29+
<UIRef Id="WixUI_ErrorProgressText" />
30+
<Publish Dialog="ExitDialog"
31+
Control="Finish"
32+
Event="DoAction"
33+
Value="LaunchFile">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
34+
</UI>
35+
<Media Id='1' Cabinet='CodeQuery64.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
36+
<Property Id='DiskPrompt' Value="CodeQuery Installation [1]" />
37+
<Directory Id='TARGETDIR' Name='SourceDir'>
38+
<Directory Id='ProgramFilesFolder' Name='PFiles'>
39+
<Directory Id='CodeQuery' Name='CodeQuery'>
40+
<Directory Id='INSTALLDIR' Name='CodeQuery 1.0.0 64bit'>
41+
<Component Id='CodeQueryGUI_64bit' Guid='dbac3c37-625f-46ac-9050-b470361351e7'>
42+
<File Id='codequeryEXE' Name='codequery.exe' DiskId='1' Source='codequery.exe' KeyPath='yes'>
43+
<Shortcut Id="startmenuCodeQueryShortcut" Directory="AppProgramMenuFolder" Name="CodeQuery"
44+
Advertise="yes" WorkingDirectory='INSTALLDIR' Icon="codequery.ico" IconIndex="0" />
45+
</File>
46+
</Component>
47+
<Component Id='cqmakedb_64bit' Guid='cd4795c7-e324-42df-852e-fca4e8d06f6e'>
48+
<File Id='cqmakedbEXE' Name='cqmakedb.exe' DiskId='1' Source='cqmakedb.exe' KeyPath='yes' />
49+
<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="no" />
50+
</Component>
51+
<Component Id='cqsearch_64bit' Guid='3186d51d-896d-4b4a-b6a4-135b13478b89'>
52+
<File Id='cqsearchEXE' Name='cqsearch.exe' DiskId='1' Source='cqsearch.exe' KeyPath='yes' />
53+
</Component>
54+
<Component Id='cscope_64bit' Guid='b4691d05-05b0-439c-a710-e76a6f2c5663'>
55+
<File Id='cscopeEXE' Name='cscope.exe' DiskId='1' Source='..\..\windows-install\wincommon\cscope.exe' KeyPath='yes' />
56+
</Component>
57+
<Component Id='ctags_64bit' Guid='eae5bea8-5e4b-4f22-9fc3-87f600ea9290'>
58+
<File Id='ctagsEXE' Name='ctags.exe' DiskId='1' Source='..\..\windows-install\wincommon\ctags.exe' KeyPath='yes' />
59+
</Component>
60+
<Component Id='docHOWTO' Guid='7ec4912d-8651-4508-a1dc-cbed5fdea69e'>
61+
<File Id='HOWTO' Name='HOWTO-WINDOWS.txt' DiskId='1' Source='..\..\windows-install\wincommon\HOWTO-WINDOWS.txt' KeyPath='yes'>
62+
<Shortcut Id="startmenuHOWTOShortcut" Directory="AppProgramMenuFolder" Name="How to use CodeQuery"
63+
Advertise="yes" WorkingDirectory='INSTALLDIR' />
64+
</File>
65+
</Component>
66+
<Component Id='docLICENSE' Guid='92846404-91b4-4218-85a0-7243c83ee6e0'>
67+
<File Id='LICENSE' Name='LICENSE.txt' DiskId='1' Source='..\..\windows-install\wincommon\LICENSE.txt' KeyPath='yes'>
68+
<Shortcut Id="startmenuLicenseShortcut" Directory="AppProgramMenuFolder" Name="LICENSE"
69+
Advertise="yes" WorkingDirectory='INSTALLDIR' />
70+
</File>
71+
</Component>
72+
<Component Id='docREADME' Guid='9128116e-9015-45be-bf3c-1a43c162c2d3'>
73+
<File Id='README' Name='README.txt' DiskId='1' Source='..\..\windows-install\wincommon\README.txt' KeyPath='yes'>
74+
<Shortcut Id="startmenuREADMEShortcut" Directory="AppProgramMenuFolder" Name="README"
75+
Advertise="yes" WorkingDirectory='INSTALLDIR' />
76+
</File>
77+
</Component>
78+
<Component Id='sqlite3_64bit' Guid='30d870ff-0a4e-4dcf-b02e-af1cc1ba40d9'>
79+
<File Id='sqlite3DLL' Name='sqlite3.dll' DiskId='1' Source='sqlite3.dll' KeyPath='yes' />
80+
</Component>
81+
<Component Id='BaseDLLsWin64' Guid='8ec9395d-83f5-43ef-b9d9-1c5e20fa309e'>
82+
<File Id='GCCDLL' Name='libgcc_s_seh-1.dll' DiskId='1' Source='libgcc_s_seh-1.dll' KeyPath='yes' />
83+
<File Id='STDCPPDLL' Name='libstdc++-6.dll' DiskId='1' Source='libstdc++-6.dll' KeyPath='no' />
84+
<File Id='WinPThreadDLL' Name='libwinpthread-1.dll' DiskId='1' Source='libwinpthread-1.dll' KeyPath='no' />
85+
</Component>
86+
<Component Id='GraphicsDLL64' Guid='9d6c5d83-9fc1-49b6-b3a0-e2b40fc97fcc'>
87+
<File Id='Direct3D' Name='D3Dcompiler_47.dll' DiskId='1' Source='D3Dcompiler_47.dll' KeyPath='no' />
88+
<File Id='OpenGL' Name='opengl32sw.dll' DiskId='1' Source='opengl32sw.dll' KeyPath='yes' />
89+
</Component>
90+
<Component Id='QT6MainDLL' Guid='ba3688a5-ce0d-4d4e-8c24-3d7d3597f2b0'>
91+
<File Id='Qt6Concurrent' Name='Qt6Concurrent.dll' DiskId='1' Source='Qt6Concurrent.dll' KeyPath='no' />
92+
<File Id='Qt6Core' Name='Qt6Core.dll' DiskId='1' Source='Qt6Core.dll' KeyPath='yes' />
93+
<File Id='Qt6Gui' Name='Qt6Gui.dll' DiskId='1' Source='Qt6Gui.dll' KeyPath='no' />
94+
<File Id='Qt6Svg' Name='Qt6Svg.dll' DiskId='1' Source='Qt6Svg.dll' KeyPath='no' />
95+
<File Id='Qt6Widgets' Name='Qt6Widgets.dll' DiskId='1' Source='Qt6Widgets.dll' KeyPath='no' />
96+
<File Id='Qt6Xml' Name='Qt6Xml.dll' DiskId='1' Source='Qt6Xml.dll' KeyPath='no' />
97+
<File Id='Qt6Core5Compat' Name='Qt6Core5Compat.dll' DiskId='1' Source='Qt6Core5Compat.dll' KeyPath='no' />
98+
</Component>
99+
<Directory Id='iconengines' Name='iconengines'>
100+
<Component Id='QT6IconEngines' Guid='e9d0d52b-4b9f-4fa4-88eb-169208a4e4ea'>
101+
<File Id='qsvgicon' Name='qsvgicon.dll' DiskId='1' Source='iconengines\qsvgicon.dll' KeyPath='yes' />
102+
</Component>
103+
</Directory>
104+
<Directory Id='imageformats' Name='imageformats'>
105+
<Component Id='QT6ImageFormats' Guid='79dc182e-cca3-4662-a6bd-c509469b39f2'>
106+
<File Id='qgif' Name='qgif.dll' DiskId='1' Source='imageformats\qgif.dll' KeyPath='no' />
107+
<File Id='qico' Name='qico.dll' DiskId='1' Source='imageformats\qico.dll' KeyPath='yes' />
108+
<File Id='qjpeg' Name='qjpeg.dll' DiskId='1' Source='imageformats\qjpeg.dll' KeyPath='no' />
109+
<File Id='qsvg' Name='qsvg.dll' DiskId='1' Source='imageformats\qsvg.dll' KeyPath='no' />
110+
</Component>
111+
</Directory>
112+
<Directory Id='platforms' Name='platforms'>
113+
<Component Id='QT6Platforms' Guid='ddf5da25-f17e-4244-8a02-d14b383f7d8d'>
114+
<File Id='qwindows' Name='qwindows.dll' DiskId='1' Source='platforms\qwindows.dll' KeyPath='yes' />
115+
</Component>
116+
</Directory>
117+
<Directory Id='styles' Name='styles'>
118+
<Component Id='QT6Styles' Guid='247d54df-7f3c-40f7-a1f7-2cc3f70e7db1'>
119+
<File Id='qmodernwindowsstyle' Name='qmodernwindowsstyle.dll' DiskId='1' Source='styles\qmodernwindowsstyle.dll' KeyPath='yes' />
120+
</Component>
121+
</Directory>
122+
<Directory Id='generic' Name='generic'>
123+
<Component Id='QT6Generic' Guid='ee67889c-1428-46c1-b3b1-13ce4374522c'>
124+
<File Id='qtuiotouchplugin' Name='qtuiotouchplugin.dll' DiskId='1' Source='generic\qtuiotouchplugin.dll' KeyPath='yes' />
125+
</Component>
126+
</Directory>
127+
<Directory Id='networkinformation' Name='networkinformation'>
128+
<Component Id='QT6NetworkInformation' Guid='24eecbd4-7d77-4ca9-a2a4-723f1e859976'>
129+
<File Id='qnetworklistmanager' Name='qnetworklistmanager.dll' DiskId='1' Source='networkinformation\qnetworklistmanager.dll' KeyPath='yes' />
130+
</Component>
131+
</Directory>
132+
<Directory Id='tls' Name='tls'>
133+
<Component Id='QT6TLS' Guid='47410719-3419-4c30-a947-99650eebc95e'>
134+
<File Id='qcertonlybackend' Name='qcertonlybackend.dll' DiskId='1' Source='tls\qcertonlybackend.dll' KeyPath='yes' />
135+
<!--<File Id='qopensslbackend' Name='qopensslbackend.dll' DiskId='1' Source='tls\qopensslbackend.dll' KeyPath='no' />-->
136+
<File Id='qschannelbackend' Name='qschannelbackend.dll' DiskId='1' Source='tls\qschannelbackend.dll' KeyPath='no' />
137+
</Component>
138+
</Directory>
139+
<Directory Id='translations' Name='translations'>
140+
<Component Id='QT6Translations' Guid='5830199b-4009-4d9b-a788-306e19a498a8'>
141+
<File Id='qt_ar' Name='qt_ar.qm' DiskId='1' Source='translations\qt_ar.qm' KeyPath='no' />
142+
<File Id='qt_bg' Name='qt_bg.qm' DiskId='1' Source='translations\qt_bg.qm' KeyPath='no' />
143+
<File Id='qt_ca' Name='qt_ca.qm' DiskId='1' Source='translations\qt_ca.qm' KeyPath='no' />
144+
<File Id='qt_cs' Name='qt_cs.qm' DiskId='1' Source='translations\qt_cs.qm' KeyPath='no' />
145+
<File Id='qt_da' Name='qt_da.qm' DiskId='1' Source='translations\qt_da.qm' KeyPath='no' />
146+
<File Id='qt_de' Name='qt_de.qm' DiskId='1' Source='translations\qt_de.qm' KeyPath='no' />
147+
<File Id='qt_en' Name='qt_en.qm' DiskId='1' Source='translations\qt_en.qm' KeyPath='yes' />
148+
<File Id='qt_es' Name='qt_es.qm' DiskId='1' Source='translations\qt_es.qm' KeyPath='no' />
149+
<File Id='qt_fi' Name='qt_fi.qm' DiskId='1' Source='translations\qt_fi.qm' KeyPath='no' />
150+
<File Id='qt_fr' Name='qt_fr.qm' DiskId='1' Source='translations\qt_fr.qm' KeyPath='no' />
151+
<File Id='qt_gd' Name='qt_gd.qm' DiskId='1' Source='translations\qt_gd.qm' KeyPath='no' />
152+
<File Id='qt_he' Name='qt_he.qm' DiskId='1' Source='translations\qt_he.qm' KeyPath='no' />
153+
<File Id='qt_hu' Name='qt_hu.qm' DiskId='1' Source='translations\qt_hu.qm' KeyPath='no' />
154+
<File Id='qt_it' Name='qt_it.qm' DiskId='1' Source='translations\qt_it.qm' KeyPath='no' />
155+
<File Id='qt_ja' Name='qt_ja.qm' DiskId='1' Source='translations\qt_ja.qm' KeyPath='no' />
156+
<File Id='qt_ko' Name='qt_ko.qm' DiskId='1' Source='translations\qt_ko.qm' KeyPath='no' />
157+
<File Id='qt_lv' Name='qt_lv.qm' DiskId='1' Source='translations\qt_lv.qm' KeyPath='no' />
158+
<File Id='qt_pl' Name='qt_pl.qm' DiskId='1' Source='translations\qt_pl.qm' KeyPath='no' />
159+
<File Id='qt_ru' Name='qt_ru.qm' DiskId='1' Source='translations\qt_ru.qm' KeyPath='no' />
160+
<File Id='qt_sk' Name='qt_sk.qm' DiskId='1' Source='translations\qt_sk.qm' KeyPath='no' />
161+
<File Id='qt_uk' Name='qt_uk.qm' DiskId='1' Source='translations\qt_uk.qm' KeyPath='no' />
162+
<File Id='qt_zh_TW' Name='qt_zh_TW.qm' DiskId='1' Source='translations\qt_zh_TW.qm' KeyPath='no' />
163+
</Component>
164+
</Directory>
165+
<Component Id='CodeQueryUninstall' Guid='72881870-977f-40c7-991d-00dc5c04540e'>
166+
<File Id='uninstallBAT' Name='uninstall.bat' DiskId='1' Source='..\..\windows-install\wincommon\uninstall.bat'
167+
KeyPath='yes' >
168+
<Shortcut Id="startmenuUninstallShortcut" Directory="AppProgramMenuFolder" Name="Uninstall CodeQuery" Show='minimized'
169+
Arguments='[ProductCode]' Advertise="yes" WorkingDirectory='INSTALLDIR' Icon="msiexec.ico" IconIndex="0" />
170+
</File>
171+
</Component>
172+
</Directory>
173+
</Directory>
174+
</Directory>
175+
<Directory Id="ProgramMenuFolder" Name="Programs">
176+
<Directory Id="AppProgramMenuFolder" Name="CodeQuery 1.0.0 (64-bit)" />
177+
</Directory>
178+
</Directory>
179+
<DirectoryRef Id="AppProgramMenuFolder">
180+
<Component Id="AppProgramMenuFolder" Guid="54927fbd-15b3-4599-998d-e3acad24120a">
181+
<RemoveFolder Id='AppProgramMenuFolder' On='uninstall' />
182+
<RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
183+
</Component>
184+
</DirectoryRef>
185+
<Feature Id='Complete' Title='CodeQuery 1.0.0 (Qt6, 64-bit)' Description='The complete package.' Level='1' ConfigurableDirectory='INSTALLDIR' InstallDefault='local' Absent='disallow'>
186+
<ComponentRef Id='CodeQueryGUI_64bit' />
187+
<ComponentRef Id='cqmakedb_64bit' />
188+
<ComponentRef Id='cqsearch_64bit' />
189+
<ComponentRef Id='cscope_64bit' />
190+
<ComponentRef Id='ctags_64bit' />
191+
<ComponentRef Id='docHOWTO' />
192+
<ComponentRef Id='docLICENSE' />
193+
<ComponentRef Id='docREADME' />
194+
<ComponentRef Id='sqlite3_64bit' />
195+
<ComponentRef Id='BaseDLLsWin64' />
196+
<ComponentRef Id='GraphicsDLL64' />
197+
<ComponentRef Id='QT6MainDLL' />
198+
<ComponentRef Id='QT6IconEngines' />
199+
<ComponentRef Id='QT6ImageFormats' />
200+
<ComponentRef Id='QT6Platforms' />
201+
<ComponentRef Id='QT6Styles' />
202+
<ComponentRef Id='QT6Generic' />
203+
<ComponentRef Id='QT6NetworkInformation' />
204+
<ComponentRef Id='QT6TLS' />
205+
<ComponentRef Id='QT6Translations' />
206+
<ComponentRef Id='CodeQueryUninstall' />
207+
<ComponentRef Id='AppProgramMenuFolder' />
208+
</Feature>
209+
</Product>
210+
</Wix>

‎windows-install/qt6/packqt6_github.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cd output
1010
rem windeployqt --release --verbose 0 --list relative codequery.exe
1111
windeployqt codequery.exe
1212
dir /b/a/s
13-
candle.exe -ext WixUIExtension -ext WixUtilExtension "..\..\windows-install\qt6\codequeryqt671.wxs"
14-
light.exe -ext WixUIExtension -ext WixUtilExtension codequeryqt671.wixobj
13+
candle.exe -ext WixUIExtension -ext WixUtilExtension "..\..\windows-install\qt6\codequeryqt690.wxs"
14+
light.exe -ext WixUIExtension -ext WixUtilExtension codequeryqt690.wixobj
1515
dir /a/s *.msi
1616

0 commit comments

Comments
 (0)