Skip to content

Commit 36adf67

Browse files
committed
fix cmd
1 parent d47592c commit 36adf67

File tree

4 files changed

+28
-9
lines changed

4 files changed

+28
-9
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
- name: Read changelog
4343
id: changelog
4444
uses: mindsers/changelog-reader-action@v2
45+
continue-on-error: true
4546
with:
4647
version: ${{ env.VERSION }}
4748
path: ./CHANGELOG.md
@@ -52,6 +53,8 @@ jobs:
5253
with:
5354
version: '6.8.1'
5455
arch: 'win64_msvc2022_64'
56+
modules: 'qtentrypoint'
57+
5558

5659
- name: Setup MSVC
5760
uses: microsoft/setup-msbuild@v1.1
@@ -75,8 +78,8 @@ jobs:
7578
- name: Create GitHub Release
7679
uses: softprops/action-gh-release@v2
7780
with:
78-
# Use body from CHANGELOG.md
79-
body: ${{ steps.changelog.outputs.changes }}
81+
body: |
82+
${{ steps.changelog.outputs.changes || 'No changelog entry for this version.' }}
8083
# Dynamic release name
8184
name: QuickImageMerge ${{ github.ref_name }}
8285
# Specify which files to attach

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [1.0.2] - 2025-08-23
4+
### Fixed
5+
- Fixed an empty command line window opening on top of the main window.
6+
37
## [1.0.1] - 2025-08-22
48
### Added
59
- Added quick save option for saving files without opening any dialogs.

CMakeLists.txt

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@ project(QuickImageMerge)
44
set(CMAKE_CXX_STANDARD 17)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66

7-
set(CMAKE_PREFIX_PATH "C:/Qt/6.9.1/mingw_64")
7+
if(NOT DEFINED ENV{CI})
8+
set(CMAKE_PREFIX_PATH "C:/Qt/6.9.1/mingw_64")
9+
endif()
10+
# -------------------------------------------------------------
811

912
set(CMAKE_AUTOMOC ON)
1013
set(CMAKE_AUTOUIC ON)
1114
set(CMAKE_AUTORCC ON)
1215

13-
find_package(Qt6 REQUIRED COMPONENTS Widgets)
16+
list(APPEND QT_COMPONENTS Widgets)
17+
if(MSVC)
18+
list(APPEND QT_COMPONENTS EntryPoint)
19+
endif()
20+
find_package(Qt6 REQUIRED COMPONENTS ${QT_COMPONENTS})
21+
1422

1523
add_executable(QuickImageMerge
1624
main.cpp
@@ -21,9 +29,9 @@ add_executable(QuickImageMerge
2129
imageprocessor.h
2230
)
2331

24-
target_link_libraries(QuickImageMerge PRIVATE Qt6::Widgets)
2532

26-
# Add the -mwindows linker flag to suppress the console window on Windows
27-
if(WIN32)
28-
target_link_options(QuickImageMerge PRIVATE -mwindows)
29-
endif()
33+
list(APPEND QT_LIBRARIES Qt6::Widgets)
34+
if(MSVC)
35+
list(APPEND QT_LIBRARIES Qt6::EntryPoint)
36+
endif()
37+
target_link_libraries(QuickImageMerge PRIVATE ${QT_LIBRARIES})

main.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#if defined(_MSC_VER)
2+
#pragma comment(linker, "/SUBSYSTEM:WINDOWS")
3+
#endif
4+
15
#include "mainwindow.h"
26
#include <QApplication>
37

0 commit comments

Comments
 (0)