Skip to content

Commit

Permalink
Windows style changed from windowsvista to modernwindows
Browse files Browse the repository at this point in the history
From 6.6.3 to 6.7.0
Load the correct style depending on the QT version
  • Loading branch information
chris2511 committed Oct 4, 2024
1 parent 0db544c commit dc81c25
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@ if (APPLE)
elseif(WIN32)

set(RUNTIME_DEST ${CMAKE_PROJECT_NAME}-portable-${PROJECT_VERSION})
if (${QT_VERSION} VERSION_LESS 6.7.0)
set(WINDOWSSTYLE "windowsvistastyle")
else()
set(WINDOWSSTYLE "modernwindowsstyle")
endif()

else()

Expand Down
6 changes: 6 additions & 0 deletions misc/dynamic.wxs.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
<File Id="QtHelp.dll" Source="@[email protected]" KeyPath="yes"/>
</Component>
</DirectoryRef>
<DirectoryRef Id="styles">
<Component Id="Cqwindowsstyle" Guid="8e3dfb18-9a16-4b94-a5a5-90d9c4cc0038">
<File Id="q@[email protected]" Source="styles/q@[email protected]" KeyPath="yes"/>
</Component>
</DirectoryRef>

<FeatureGroup Id="DatabaseGroup">
<Feature Id="Databases" Title="Remote Database Drivers"
Description="QT remote database drivers. Additional DLL from the manufacturer are required. See https://github.com/chris2511/xca" Level="1">
Expand Down
8 changes: 1 addition & 7 deletions misc/xca.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,6 @@
</Component>
</DirectoryRef>

<DirectoryRef Id="styles">
<Component Id="Cqwindowsvistastyle" Guid="8e3dfb18-9a16-4b94-a5a5-90d9c4cc0038">
<File Id="qwindowsvistastyle.dll" Source="styles/qwindowsvistastyle.dll" KeyPath="yes"/>
</Component>
</DirectoryRef>

<DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="391c2a6f-bfe2-46e3-bcec-0e9413070696">
<Shortcut Id="ApplicationStartMenuShortcut"
Expand Down Expand Up @@ -172,7 +166,7 @@
<ComponentRef Id="Cxca.exe" />
<ComponentRef Id="Cqwindows" />
<ComponentRef Id="Cqsqlite" />
<ComponentRef Id="Cqwindowsvistastyle" />
<ComponentRef Id="Cqwindowsstyle" />
<ComponentRef Id="Clibstdcpp6"/>
<ComponentRef Id="Clibwinpthread1"/>
<ComponentRef Id="Clibgcc_s_seh1"/>
Expand Down
2 changes: 1 addition & 1 deletion release/build-w64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ do_openssl() {
OSSL="openssl-3.3.2"
XCA_DIR="$(cd `dirname $0`/.. && pwd)"
TOP_DIR="`dirname $XCA_DIR`"
QT_DIR="$TOP_DIR/QT/6.6.3/mingw_64"
QT_DIR="$TOP_DIR/QT/6.8.0/mingw_64"
BUILDDIR="$TOP_DIR/w64-release"
INSTALL_DIR="/c/OpenSSL"
JOBS=7
Expand Down

0 comments on commit dc81c25

Please sign in to comment.