Skip to content

Commit 294f725

Browse files
CapibarikCapibarik
committed
Микрокоммит
1 parent 775e3d6 commit 294f725

File tree

2 files changed

+29
-28
lines changed

2 files changed

+29
-28
lines changed

‎CMakeLists.txt.user‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 15.0.1, 2025-05-20T03:18:13. -->
3+
<!-- Written by QtCreator 15.0.1, 2025-05-23T21:48:20. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
@@ -95,23 +95,23 @@
9595
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.8.2 MinGW 64-bit</value>
9696
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.8.2 MinGW 64-bit</value>
9797
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.682.win64_mingw_kit</value>
98-
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
98+
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
9999
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
100100
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
101101
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
102102
<value type="QString" key="CMake.Build.Type">Debug</value>
103103
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
104104
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
105105
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
106-
<value type="QString" key="CMake.Initial.Parameters">-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
106+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
107+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
107108
-DCMAKE_BUILD_TYPE:STRING=Debug
108109
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
109110
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
110-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
111-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
112-
-DCMAKE_GENERATOR:STRING=Ninja
111+
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
113112
-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
114-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}</value>
113+
-DCMAKE_GENERATOR:STRING=Ninja
114+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
115115
<value type="int" key="EnableQmlDebugging">0</value>
116116
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\PanCrack-Debug</value>
117117
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@@ -161,15 +161,15 @@
161161
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
162162
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
163163
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
164-
<value type="QString" key="CMake.Initial.Parameters">-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
164+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
165+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
165166
-DCMAKE_BUILD_TYPE:STRING=Release
166167
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
167168
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
168-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
169-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
170-
-DCMAKE_GENERATOR:STRING=Ninja
169+
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
171170
-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
172-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}</value>
171+
-DCMAKE_GENERATOR:STRING=Ninja
172+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
173173
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\PanCrack-Release\</value>
174174
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
175175
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -218,15 +218,15 @@
218218
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
219219
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
220220
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
221-
<value type="QString" key="CMake.Initial.Parameters">-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
221+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
222+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
222223
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
223224
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
224225
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
225-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
226-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
227-
-DCMAKE_GENERATOR:STRING=Ninja
226+
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
228227
-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
229-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}</value>
228+
-DCMAKE_GENERATOR:STRING=Ninja
229+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
230230
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\PanCrack\build\Desktop_Qt_6_8_2_MinGW_64_bit-RelWithDebInfo</value>
231231
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
232232
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -273,15 +273,15 @@
273273
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
274274
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
275275
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
276-
<value type="QString" key="CMake.Initial.Parameters">-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
276+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
277+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
277278
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
278279
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
279280
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
280-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
281-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
282-
-DCMAKE_GENERATOR:STRING=Ninja
281+
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
283282
-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
284-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}</value>
283+
-DCMAKE_GENERATOR:STRING=Ninja
284+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
285285
<value type="int" key="EnableQmlDebugging">0</value>
286286
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\PanCrack\build\Desktop_Qt_6_8_2_MinGW_64_bit-Profile</value>
287287
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@@ -329,15 +329,15 @@
329329
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
330330
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
331331
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
332-
<value type="QString" key="CMake.Initial.Parameters">-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
332+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
333+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
333334
-DCMAKE_BUILD_TYPE:STRING=MinSizeRel
334335
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
335336
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
336-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
337-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
338-
-DCMAKE_GENERATOR:STRING=Ninja
337+
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
339338
-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
340-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}</value>
339+
-DCMAKE_GENERATOR:STRING=Ninja
340+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
341341
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\PanCrack\build\Desktop_Qt_6_8_2_MinGW_64_bit-MinSizeRel</value>
342342
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
343343
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -444,7 +444,7 @@
444444
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
445445
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
446446
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
447-
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/PanCrack-Release</value>
447+
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/PanCrack-Debug</value>
448448
</valuemap>
449449
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
450450
</valuemap>

‎PanCrackContent/Scrimer.qml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Item {
2121
opacity: 0.7
2222
}
2323

24+
2425
// Основное изображение скримера
2526
Image {
2627
id: scrimerImage

0 commit comments

Comments
 (0)