diff --git a/externals b/externals index a0c18ab58..bf464d0ea 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit a0c18ab58c1e0783614c63be5f42b4073b22ba97 +Subproject commit bf464d0ea12cdbe91b1bd24a4a364cc537235489 diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.ui b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.ui index e2aedaa28..254d8ae7d 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.ui +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.ui @@ -156,11 +156,16 @@ console=1 - 4.4 64bit + 4.5 64bit 0 + + + 4.5 64bit + + 4.4 64bit diff --git a/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp b/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp index bd4d7f120..1065515e7 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsymbols.cpp @@ -189,8 +189,10 @@ P3DSimConnectVersion stringToP3DVersion(const QString &p3d) if (p.contains("41")) { return P3DSimConnectv41; } if (p.contains("42")) { return P3DSimConnectv42; } if (p.contains("43")) { return P3DSimConnectv43; } + if (p.contains("44")) { return P3DSimConnectv44; } + if (p.contains("45")) { return P3DSimConnectv45; } } - return P3DSimConnectv42; // default + return P3DSimConnectv44; // default } bool loadAndResolveP3DSimConnect(P3DSimConnectVersion version) @@ -206,6 +208,8 @@ bool loadAndResolveP3DSimConnect(P3DSimConnectVersion version) case P3DSimConnectv41: simConnectFileName += "v4.1"; break; case P3DSimConnectv42: simConnectFileName += "v4.2"; break; case P3DSimConnectv43: simConnectFileName += "v4.3"; break; + case P3DSimConnectv44: simConnectFileName += "v4.4"; break; + case P3DSimConnectv45: simConnectFileName += "v4.5"; break; } QLibrary simConnectDll(simConnectFileName); diff --git a/src/plugins/simulator/fsxcommon/simconnectsymbols.h b/src/plugins/simulator/fsxcommon/simconnectsymbols.h index b2df8d493..d7b39c23c 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsymbols.h +++ b/src/plugins/simulator/fsxcommon/simconnectsymbols.h @@ -23,7 +23,9 @@ enum P3DSimConnectVersion P3DSimConnectv40, P3DSimConnectv41, P3DSimConnectv42, - P3DSimConnectv43 + P3DSimConnectv43, + P3DSimConnectv44, + P3DSimConnectv45 }; //! String to the enum diff --git a/src/plugins/simulator/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro index bb8398ab3..67ad6479a 100644 --- a/src/plugins/simulator/p3d/p3d.pro +++ b/src/plugins/simulator/p3d/p3d.pro @@ -32,5 +32,4 @@ win32 { INSTALLS += target } - load(common_post)