Skip to content

Commit 5281c15

Browse files
committed
Squashed commit of v4.3.2
1 parent 100af30 commit 5281c15

File tree

10,274 files changed

+5483716
-1720204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,274 files changed

+5483716
-1720204
lines changed

.clangd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CompileFlags:
2+
CompilationDatabase: build.tooldata/

.github/workflows/build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name: Build webmscore
33
on:
44
workflow_dispatch:
55
inputs: {}
6-
push:
7-
branches:
8-
- 'webmscore'
9-
- 'Xmader/**'
106

117
concurrency:
128
group: ${{ github.workflow }}-${{ github.ref }}

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
*.autosave
55
.qped
66
.directory
7+
.idea
8+
.vscode/
79
/builds
810
/build_overrides.cmake
911
build.release
1012
build.debug
1113
build.install
14+
build.tooldata
1215
build.qtc
1316
build-*
1417
win32build
@@ -27,9 +30,7 @@ MuseScorePortable
2730
/*.includes
2831
*.user
2932
/share/locale/*placeholder.ts
30-
*.qm
31-
share/manual/en
32-
share/manual/de
33+
/share/locale/*.qm
3334
/share/instruments/tsv
3435
Doc
3536
DocLib
@@ -65,3 +66,5 @@ VERSION
6566
# Backup Files created by Merging Softwares (Example: Meld)
6667
*.orig
6768
.ccache
69+
70+
temp_*

.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[main]
2-
host = https://www.transifex.com
2+
host = https://app.transifex.com
33

44
[o:musescore:p:musescore:r:musescore]
55
file_filter = share/locale/musescore_<lang>.ts

.vscode/c_cpp_properties.json

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

.vscode/extensions.json

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

.vscode/launch.json

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

.vscode/settings.json

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

CMakeSettings.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"configurations": [
44
{
55
"name": "x64-RelWithDebInfo",
6-
"generator": "Visual Studio 16 2019 Win64",
6+
"generator": "Visual Studio 17 2022 Win64",
77
"configurationType": "RelWithDebInfo",
88
"inheritEnvironments": [ "msvc_x64_x64" ],
99
"buildRoot": "${projectDir}\\msvc.build_x64", // "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
@@ -15,11 +15,7 @@
1515
"value": "RELWITHDEBINFO"
1616
},
1717
{
18-
"name": "BUILD_FOR_WINSTORE",
19-
"value": "OFF"
20-
},
21-
{
22-
"name": "BUILD_64",
18+
"name": "MUE_COMPILE_BUILD_64",
2319
"value": "ON"
2420
},
2521
{
@@ -35,4 +31,4 @@
3531
"ctestCommandArgs": ""
3632
}
3733
]
38-
}
34+
}

0 commit comments

Comments
 (0)