generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-12 10:13:51 +01:00
Code Issues Projects Releases Wiki Activity

Update inspector build to work with Qt6

Browse Source
This commit is contained in:
Tristan Penman 2021-11-05 08:33:43 +11:00
parent 7b6d22f166
commit af071f0198
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inspector/CMakeLists.txt
View File

@ -1,5 +1,3 @@
# Reference: http://qt-project.org/doc/qt-5.0/qtdoc/cmake-manual.html
cmake_minimum_required(VERSION 3.0)
# Add folder where are supportive functions
@ -17,7 +15,7 @@ project(inspector VERSION 1.0)
fix_project_version()
# Set additional project information
set(COPYRIGHT "Copyright (c) 2020 Tristan Penman. All rights reserved.")
set(COPYRIGHT "Copyright (c) 2021 Tristan Penman. All rights reserved.")
set(IDENTIFIER "com.tristanpenman.valijson.inspector")
set(SOURCE_FILES
@ -30,10 +28,14 @@ include_directories(SYSTEM ../include)
add_project_meta(META_FILES_TO_INCLUDE)
find_package(Qt5 COMPONENTS Widgets REQUIRED)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Widgets REQUIRED)
add_executable(${PROJECT_NAME} ${OS_BUNDLE} # Expands to WIN32 or MACOS_BUNDLE depending on OS
${SOURCE_FILES} ${META_FILES_TO_INCLUDE} ${RESOURCE_FILES}
)
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
target_link_libraries(${PROJECT_NAME} PRIVATE
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Widgets
)

2
inspector/src/main.cpp
View File

@ -3,7 +3,9 @@
int main(int argc, char *argv[])
{
#if QT_VERSION < 0x060000
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
QApplication app(argc, argv);
Window window;