Skip to content

Commit

Permalink
move Qt floor from 5.12 to 5.15 (#1199)
Browse files Browse the repository at this point in the history 
* move Qt floor to 5.15.

* fix focal, coverage, windows 32 bit builds.

* try harder to fix coverage build

* fix codeql build

* kill fedora 32 CI build which uses Qt 5.14.
  • Loading branch information
@tsteven4 @robertlipe
tsteven4 authored and robertlipe committed Aug 12, 2024
1 parent aada285 commit fde28de
Show file tree
Hide file tree
Showing 5 changed files with 460 additions and 112 deletions.
260 changes: 260 additions & 0 deletions .cmake/api/v1/reply/codemodel-v2-5b5d96f2a79686bb8d55.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
{
"configurations" :
[
{
"directories" :
[
{
"build" : ".",
"childIndexes" :
[
1
],
"jsonFile" : "directory-.-Debug-a297c493dc6855558c0e.json",
"minimumCMakeVersion" :
{
"string" : "3.16"
},
"projectIndex" : 0,
"source" : ".",
"targetIndexes" :
[
0,
4,
5,
6,
7,
13,
15,
16,
17,
18
]
},
{
"build" : "gui",
"childIndexes" :
[
2
],
"jsonFile" : "directory-gui-Debug-00000000000000000000.json",
"minimumCMakeVersion" :
{
"string" : "3.16"
},
"parentIndex" : 0,
"projectIndex" : 0,
"source" : "gui",
"targetIndexes" :
[
8,
9,
10,
11,
12,
14
]
},
{
"build" : "gui/coretool",
"jsonFile" : "directory-gui.coretool-Debug-87963545341ba97be176.json",
"minimumCMakeVersion" :
{
"string" : "3.16"
},
"parentIndex" : 1,
"projectIndex" : 0,
"source" : "gui/coretool",
"targetIndexes" :
[
1,
2,
3
]
}
],
"name" : "Debug",
"projects" :
[
{
"directoryIndexes" :
[
0,
1,
2
],
"name" : "gpsbabel",
"targetIndexes" :
[
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18
]
}
],
"targets" :
[
{
"directoryIndex" : 0,
"id" : "check::@6890427a1f51a3e7e1df",
"jsonFile" : "target-check-Debug-2102fa72f7384a112f71.json",
"name" : "check",
"projectIndex" : 0
},
{
"directoryIndex" : 2,
"id" : "coretool::@59ad487847001a1eac72",
"jsonFile" : "target-coretool-Debug-a7ffc6f8bf1ed76651c1.json",
"name" : "coretool",
"projectIndex" : 0
},
{
"directoryIndex" : 2,
"id" : "coretool_lrelease::@59ad487847001a1eac72",
"jsonFile" : "target-coretool_lrelease-Debug-71d6c78e389ca52f783a.json",
"name" : "coretool_lrelease",
"projectIndex" : 0
},
{
"directoryIndex" : 2,
"id" : "coretool_lupdate::@59ad487847001a1eac72",
"jsonFile" : "target-coretool_lupdate-Debug-68c815f83c50331f6566.json",
"name" : "coretool_lupdate",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "gpsbabel::@6890427a1f51a3e7e1df",
"jsonFile" : "target-gpsbabel-Debug-0e4d86b8f566431ed685.json",
"name" : "gpsbabel",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "gpsbabel.html::@6890427a1f51a3e7e1df",
"jsonFile" : "target-gpsbabel.html-Debug-0f70776b3e4f1168afc5.json",
"name" : "gpsbabel.html",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "gpsbabel.org::@6890427a1f51a3e7e1df",
"jsonFile" : "target-gpsbabel.org-Debug-9ca8afc5472be789e379.json",
"name" : "gpsbabel.org",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "gpsbabel.pdf::@6890427a1f51a3e7e1df",
"jsonFile" : "target-gpsbabel.pdf-Debug-00000000000000000000.json",
"name" : "gpsbabel.pdf",
"projectIndex" : 0
},
{
"directoryIndex" : 1,
"id" : "gpsbabelfe::@35f413a6cfe5475b20aa",
"jsonFile" : "target-gpsbabelfe-Debug-673f2d6b19af58ebaffd.json",
"name" : "gpsbabelfe",
"projectIndex" : 0
},
{
"directoryIndex" : 1,
"id" : "gpsbabelfe_autogen::@35f413a6cfe5475b20aa",
"jsonFile" : "target-gpsbabelfe_autogen-Debug-f7875ab99cea46dc8681.json",
"name" : "gpsbabelfe_autogen",
"projectIndex" : 0
},
{
"directoryIndex" : 1,
"id" : "gpsbabelfe_autogen_timestamp_deps::@35f413a6cfe5475b20aa",
"jsonFile" : "target-gpsbabelfe_autogen_timestamp_deps-Debug-b312ab01a4e1eee4b178.json",
"name" : "gpsbabelfe_autogen_timestamp_deps",
"projectIndex" : 0
},
{
"directoryIndex" : 1,
"id" : "gpsbabelfe_lrelease::@35f413a6cfe5475b20aa",
"jsonFile" : "target-gpsbabelfe_lrelease-Debug-873580379c2b9266e520.json",
"name" : "gpsbabelfe_lrelease",
"projectIndex" : 0
},
{
"directoryIndex" : 1,
"id" : "gpsbabelfe_lupdate::@35f413a6cfe5475b20aa",
"jsonFile" : "target-gpsbabelfe_lupdate-Debug-7b36a4643573de4d52d2.json",
"name" : "gpsbabelfe_lupdate",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "mkicondoc::@6890427a1f51a3e7e1df",
"jsonFile" : "target-mkicondoc-Debug-df689fbc7b8bbda53f38.json",
"name" : "mkicondoc",
"projectIndex" : 0
},
{
"directoryIndex" : 1,
"id" : "package_app::@35f413a6cfe5475b20aa",
"jsonFile" : "target-package_app-Debug-ac7c9a047052850e40c7.json",
"name" : "package_app",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "shp::@6890427a1f51a3e7e1df",
"jsonFile" : "target-shp-Debug-00000000000000000000.json",
"name" : "shp",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "strptime::@6890427a1f51a3e7e1df",
"jsonFile" : "target-strptime-Debug-7d35e8c734b70537757c.json",
"name" : "strptime",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "usb-1.0::@6890427a1f51a3e7e1df",
"jsonFile" : "target-usb-1.0-Debug-e27417ed1ca2da314428.json",
"name" : "usb-1.0",
"projectIndex" : 0
},
{
"directoryIndex" : 0,
"id" : "z::@6890427a1f51a3e7e1df",
"jsonFile" : "target-z-Debug-96ce99ee7930729e1e18.json",
"name" : "z",
"projectIndex" : 0
}
]
}
],
"kind" : "codemodel",
"paths" :
{
"build" : "/Users/robertlipe/src/gpsbabel",
"source" : "/Users/robertlipe/src/gpsbabel"
},
"version" :
{
"major" : 2,
"minor" : 6
}
}
108 changes: 108 additions & 0 deletions .cmake/api/v1/reply/index-2024-08-12T02-41-47-0642.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"cmake" :
{
"generator" :
{
"multiConfig" : false,
"name" : "Unix Makefiles"
},
"paths" :
{
"cmake" : "/Applications/CLion.app/Contents/bin/cmake/mac/aarch64/bin/cmake",
"cpack" : "/Applications/CLion.app/Contents/bin/cmake/mac/aarch64/bin/cpack",
"ctest" : "/Applications/CLion.app/Contents/bin/cmake/mac/aarch64/bin/ctest",
"root" : "/Applications/CLion.app/Contents/bin/cmake/mac/aarch64/share/cmake-3.28"
},
"version" :
{
"isDirty" : false,
"major" : 3,
"minor" : 28,
"patch" : 1,
"string" : "3.28.1",
"suffix" : ""
}
},
"objects" :
[
{
"jsonFile" : "codemodel-v2-5b5d96f2a79686bb8d55.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 6
}
},
{
"jsonFile" : "cache-v2-b2eeac0d25d492549682.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
{
"jsonFile" : "cmakeFiles-v1-5dd7b808554c3c24b457.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
{
"jsonFile" : "toolchains-v1-96ce99ee7930729e1e18.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
],
"reply" :
{
"cache-v2" :
{
"jsonFile" : "cache-v2-b2eeac0d25d492549682.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-5dd7b808554c3c24b457.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-5b5d96f2a79686bb8d55.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 6
}
},
"toolchains-v1" :
{
"jsonFile" : "toolchains-v1-96ce99ee7930729e1e18.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
}
}
Loading

0 comments on commit fde28de

Please sign in to comment.