diff --git a/ChangeLog.md b/ChangeLog.md index c2bd1be31c651b24b45b4beb249ebfd013581ff9..1257e8d362f64f9780ec73a5eeea8978e8180e36 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,6 +9,7 @@ Note: This file only contains high level features or important fixes. * Fix ArduPilot current mission item tracking in Fly view * Fix ADSB vehicle display * Fix map positioning bug in Plan view +* Fix Windows 0xcc000007b startup error causes by incorrect VC runtimes being installed. ### 4.0.0 - Stable diff --git a/QGCSetup.pri b/QGCSetup.pri index e6546f6af289e052acb87135e03e157a30595dac..9ecb1435eeafa118a03a7184e1ef5a33bc0066b5 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -79,8 +79,6 @@ WindowsBuild { # Copy Visual Studio DLLs # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed. QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\msvcp140.dll\" \"$$DESTDIR_WIN\" - QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\msvcp140_1.dll\" \"$$DESTDIR_WIN\" - QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\msvcp140_2.dll\" \"$$DESTDIR_WIN\" QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\vcruntime140.dll\" \"$$DESTDIR_WIN\" } diff --git a/deploy/msvcp140.dll b/deploy/msvcp140.dll index 6ca27d5150e0faaf4a32ee3224332cdea5b61829..98313d4c125307dbc5784b5a329c7d113183d3c8 100644 Binary files a/deploy/msvcp140.dll and b/deploy/msvcp140.dll differ diff --git a/deploy/msvcp140_1.dll b/deploy/msvcp140_1.dll deleted file mode 100644 index 64f090daf6d5d06dcc2991c6469ffe23964b59c3..0000000000000000000000000000000000000000 Binary files a/deploy/msvcp140_1.dll and /dev/null differ diff --git a/deploy/msvcp140_2.dll b/deploy/msvcp140_2.dll deleted file mode 100644 index 682fd794200adce7f9a6184ea4cfaf019702af1f..0000000000000000000000000000000000000000 Binary files a/deploy/msvcp140_2.dll and /dev/null differ diff --git a/deploy/vcruntime140.dll b/deploy/vcruntime140.dll index 3e49417f82c57023b2fd59defeb87e8b2ffea620..34a0e72504776f90526966db1e3e9d382674d613 100644 Binary files a/deploy/vcruntime140.dll and b/deploy/vcruntime140.dll differ