Skip to content

Commit dd1a876

Browse files
author
Alexander B
committed
Merge remote-tracking branch 'origin/qt6' into qt6
# Conflicts: # qldd.cpp # resources/Qldd.ico # resources/Qldd.png # resources/monofont.ttf # resources/resources.qrc
2 parents 20eaf86 + 0bcdabe commit dd1a876

25 files changed

+110
-17
lines changed

‎CMakeLists.txt

100644100755
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if (NOT Qt5_FOUND)
2121
endif ()
2222

2323
if (APPLE)
24-
set(APP_ICNS "${CMAKE_SOURCE_DIR}/resources/icon.icns")
24+
set(APP_ICNS "${CMAKE_SOURCE_DIR}/resources/Qldd.icns")
2525
add_executable(Qldd MACOSX_BUNDLE ${APP_ICNS})
2626
else ()
2727
add_executable(Qldd)
@@ -58,13 +58,13 @@ if(APPLE)
5858
install(TARGETS Qldd
5959
BUNDLE DESTINATION .
6060
RUNTIME DESTINATION .)
61-
set_source_files_properties("${CMAKE_SOURCE_DIR}/resources/icon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
61+
set_source_files_properties("${CMAKE_SOURCE_DIR}/resources/Qldd.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
6262

6363
set_target_properties(Qldd
6464
PROPERTIES
6565
MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
6666
MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} Copyright (c) 2020 bas524@yandex.ru"
67-
MACOSX_BUNDLE_ICON_FILE icon.icns
67+
MACOSX_BUNDLE_ICON_FILE Qldd.icns
6868
MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_NAME}"
6969
MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}"
7070
MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
@@ -82,9 +82,9 @@ endif()
8282
set(desktop.path applications)
8383
set(desktop.files resources/qldd.desktop)
8484
set(icon.path icons/hicolor/64x64/apps)
85-
set(icon.files resources/icon64.png)
85+
set(icon.files resources/Qldd.png)
8686
set(iconsvg.path icons/hicolor/scalable/apps)
87-
set(iconsvg.files resources/icon.svg)
87+
set(iconsvg.files resources/Qldd.svg)
8888
foreach(items IN ITEMS desktop icon iconsvg)
8989
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${${items}.files}
9090
DESTINATION share/${${items}.path}

‎CPackLinuxDeployQt.cmake.in

100644100755
File mode changed.

‎CPackMacDeployQt.cmake.in

100644100755
File mode changed.

‎Packaging.cmake

100644100755
File mode changed.

‎Qldd.desktop

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Qldd.ico

-9.44 KB
Binary file not shown.

‎Qldd.png

-2.15 KB
Binary file not shown.

‎cmake-build-qt-debug/CMakeFiles/3.25.2/CMakeCXXCompiler.cmake

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
2+
set(CMAKE_CXX_COMPILER_ARG1 "")
3+
set(CMAKE_CXX_COMPILER_ID "AppleClang")
4+
set(CMAKE_CXX_COMPILER_VERSION "14.0.0.14000029")
5+
set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "")
6+
set(CMAKE_CXX_COMPILER_WRAPPER "")
7+
set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "98")
8+
set(CMAKE_CXX_EXTENSIONS_COMPUTED_DEFAULT "ON")
9+
set(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17;cxx_std_20;cxx_std_23")
10+
set(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters")
11+
set(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
12+
set(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
13+
set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17")
14+
set(CMAKE_CXX20_COMPILE_FEATURES "cxx_std_20")
15+
set(CMAKE_CXX23_COMPILE_FEATURES "cxx_std_23")
16+
17+
set(CMAKE_CXX_PLATFORM_ID "Darwin")
18+
set(CMAKE_CXX_SIMULATE_ID "")
19+
set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT "")
20+
set(CMAKE_CXX_SIMULATE_VERSION "")
21+
22+
23+
24+
25+
set(CMAKE_AR "/usr/bin/ar")
26+
set(CMAKE_CXX_COMPILER_AR "")
27+
set(CMAKE_RANLIB "/usr/bin/ranlib")
28+
set(CMAKE_CXX_COMPILER_RANLIB "")
29+
set(CMAKE_LINKER "/usr/bin/ld")
30+
set(CMAKE_MT "")
31+
set(CMAKE_COMPILER_IS_GNUCXX )
32+
set(CMAKE_CXX_COMPILER_LOADED 1)
33+
set(CMAKE_CXX_COMPILER_WORKS TRUE)
34+
set(CMAKE_CXX_ABI_COMPILED TRUE)
35+
36+
set(CMAKE_CXX_COMPILER_ENV_VAR "CXX")
37+
38+
set(CMAKE_CXX_COMPILER_ID_RUN 1)
39+
set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;mpp;CPP;ixx;cppm)
40+
set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
41+
42+
foreach (lang C OBJC OBJCXX)
43+
if (CMAKE_${lang}_COMPILER_ID_RUN)
44+
foreach(extension IN LISTS CMAKE_${lang}_SOURCE_FILE_EXTENSIONS)
45+
list(REMOVE_ITEM CMAKE_CXX_SOURCE_FILE_EXTENSIONS ${extension})
46+
endforeach()
47+
endif()
48+
endforeach()
49+
50+
set(CMAKE_CXX_LINKER_PREFERENCE 30)
51+
set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
52+
53+
# Save compiler ABI information.
54+
set(CMAKE_CXX_SIZEOF_DATA_PTR "8")
55+
set(CMAKE_CXX_COMPILER_ABI "")
56+
set(CMAKE_CXX_BYTE_ORDER "LITTLE_ENDIAN")
57+
set(CMAKE_CXX_LIBRARY_ARCHITECTURE "")
58+
59+
if(CMAKE_CXX_SIZEOF_DATA_PTR)
60+
set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}")
61+
endif()
62+
63+
if(CMAKE_CXX_COMPILER_ABI)
64+
set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}")
65+
endif()
66+
67+
if(CMAKE_CXX_LIBRARY_ARCHITECTURE)
68+
set(CMAKE_LIBRARY_ARCHITECTURE "")
69+
endif()
70+
71+
set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "")
72+
if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX)
73+
set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}")
74+
endif()
75+
76+
77+
78+
79+
80+
set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include/c++/v1;/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/14.0.0/include;/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include;/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include")
81+
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++")
82+
set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/lib")
83+
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks")

‎cmake-build-qt-debug/CMakeFiles/3.25.2/CMakeSystem.cmake

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
set(CMAKE_HOST_SYSTEM "Darwin-22.3.0")
2+
set(CMAKE_HOST_SYSTEM_NAME "Darwin")
3+
set(CMAKE_HOST_SYSTEM_VERSION "22.3.0")
4+
set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")
5+
6+
7+
8+
set(CMAKE_SYSTEM "Darwin-22.3.0")
9+
set(CMAKE_SYSTEM_NAME "Darwin")
10+
set(CMAKE_SYSTEM_VERSION "22.3.0")
11+
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
12+
13+
set(CMAKE_CROSSCOMPILING "FALSE")
14+
15+
set(CMAKE_SYSTEM_LOADED 1)

‎cmake-build-qt-debug/Qldd_autogen/mocs_compilation.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// This file is autogenerated. Changes will be overwritten.
2+
#include "EWIEGA46WW/moc_finfdialog.cpp"
3+
#include "EWIEGA46WW/moc_mainwindow.cpp"

0 commit comments

Comments
 (0)