From c0382df395c13beb9bc9376092bc63eff9973509 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Tue, 15 Sep 2020 00:08:56 +0100 Subject: [PATCH] Some qmake fixes --- src/plugins/simulator/fsxconfig/fsxconfig.pro | 3 +-- src/plugins/simulator/p3d/p3d.pro | 5 ----- src/plugins/simulator/p3dconfig/p3dconfig.pro | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/plugins/simulator/fsxconfig/fsxconfig.pro b/src/plugins/simulator/fsxconfig/fsxconfig.pro index e31edfce3..f10043938 100644 --- a/src/plugins/simulator/fsxconfig/fsxconfig.pro +++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro @@ -17,7 +17,7 @@ HEADERS += *.h REQUIRES += swiftConfig(sims.fsx) TARGET = simulatorfsxconfig -DISTFILES += simulatorfsx.json +DISTFILES += simulatorfsxconfig.json win32 { dlltarget.path = $$PREFIX/bin/plugins/simulator @@ -27,5 +27,4 @@ win32 { INSTALLS += target } - load(common_post) diff --git a/src/plugins/simulator/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro index 67ad6479a..9f03fac5d 100644 --- a/src/plugins/simulator/p3d/p3d.pro +++ b/src/plugins/simulator/p3d/p3d.pro @@ -1,10 +1,5 @@ load(common_pre) -load(common_pre) - -# the P3D version is decided here -# client\mkspecs\features\libraries.pri - QT += core dbus widgets network TEMPLATE = lib diff --git a/src/plugins/simulator/p3dconfig/p3dconfig.pro b/src/plugins/simulator/p3dconfig/p3dconfig.pro index c962dfe95..301234860 100644 --- a/src/plugins/simulator/p3dconfig/p3dconfig.pro +++ b/src/plugins/simulator/p3dconfig/p3dconfig.pro @@ -17,7 +17,7 @@ HEADERS += *.h REQUIRES += swiftConfig(sims.p3d) TARGET = simulatorp3dconfig -DISTFILES += simulatorp3d.json +DISTFILES += simulatorp3dconfig.json win32 { dlltarget.path = $$PREFIX/bin/plugins/simulator