The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows style changed from windowsvista to modernwindows
Some checks are pending
CMake / build (build/xca-*-Linux.tar.gz, Unix Makefiles, linux, /usr, ubuntu, 5.15.2, ubuntu-latest) (push) Waiting to run
Details
CMake / build (build/xca-*-Linux.tar.gz, Unix Makefiles, linux, /usr, ubuntu, 6.6.2, ubuntu-latest) (push) Waiting to run
Details
CMake / build (build/xca-*.dmg, Unix Makefiles, mac, /opt/homebrew/opt/openssl, macos, 6.6.2, macos-latest) (push) Waiting to run
Details
CMake / build (build/xca-*.msi build/xca-portable-*.zip , MinGW Makefiles, windows, D:\msys2\msys64\mingw64, windows, 5.15.2, windows-2019, win64_mingw81) (push) Waiting to run
Details

Browse Source 
From 6.6.3 to 6.7.0
Load the correct style depending on the QT version
This commit is contained in:
Christian Hohnstaedt 2024-10-04 15:58:11 +02:00
parent 0db544c697
commit dc81c25670
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -160,6 +160,11 @@ if (APPLE)
elseif(WIN32) elseif(WIN32)
set(RUNTIME_DEST ${CMAKE_PROJECT_NAME}-portable-${PROJECT_VERSION}) 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() else()

6
misc/dynamic.wxs.in
View File

@ -29,6 +29,12 @@
<File Id="QtHelp.dll" Source="@QT@Help.dll" KeyPath="yes"/> <File Id="QtHelp.dll" Source="@QT@Help.dll" KeyPath="yes"/>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="styles">
<Component Id="Cqwindowsstyle" Guid="8e3dfb18-9a16-4b94-a5a5-90d9c4cc0038">
<File Id="q@WINDOWSSTYLE@.dll" Source="styles/q@WINDOWSSTYLE@.dll" KeyPath="yes"/>
</Component>
</DirectoryRef>
<FeatureGroup Id="DatabaseGroup"> <FeatureGroup Id="DatabaseGroup">
<Feature Id="Databases" Title="Remote Database Drivers" <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"> Description="QT remote database drivers. Additional DLL from the manufacturer are required. See https://github.com/chris2511/xca" Level="1">

8
misc/xca.wxs
View File

@ -131,12 +131,6 @@
</Component> </Component>
</DirectoryRef> </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"> <DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="391c2a6f-bfe2-46e3-bcec-0e9413070696"> <Component Id="ApplicationShortcut" Guid="391c2a6f-bfe2-46e3-bcec-0e9413070696">
<Shortcut Id="ApplicationStartMenuShortcut" <Shortcut Id="ApplicationStartMenuShortcut"
@ -172,7 +166,7 @@
<ComponentRef Id="Cxca.exe" /> <ComponentRef Id="Cxca.exe" />
<ComponentRef Id="Cqwindows" /> <ComponentRef Id="Cqwindows" />
<ComponentRef Id="Cqsqlite" /> <ComponentRef Id="Cqsqlite" />
<ComponentRef Id="Cqwindowsvistastyle" /> <ComponentRef Id="Cqwindowsstyle" />
<ComponentRef Id="Clibstdcpp6"/> <ComponentRef Id="Clibstdcpp6"/>
<ComponentRef Id="Clibwinpthread1"/> <ComponentRef Id="Clibwinpthread1"/>
<ComponentRef Id="Clibgcc_s_seh1"/> <ComponentRef Id="Clibgcc_s_seh1"/>

2
release/build-w64.sh
View File

@ -16,7 +16,7 @@ do_openssl() {
OSSL="openssl-3.3.2" OSSL="openssl-3.3.2"
XCA_DIR="$(cd `dirname $0`/.. && pwd)" XCA_DIR="$(cd `dirname $0`/.. && pwd)"
TOP_DIR="`dirname $XCA_DIR`" 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" BUILDDIR="$TOP_DIR/w64-release"
INSTALL_DIR="/c/OpenSSL" INSTALL_DIR="/c/OpenSSL"
JOBS=7 JOBS=7