Refactor qmake SUBDIRS structure

The big swift.pro is refactored by the correct usage of SUBDIRS
template. The following additional changes are made:
- Removed '_' from all targets and folder names
- Aligned parent folder and target name

refs #461

src/plugins/simulator/fs9/fs9.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus gui network concurrent xml
 
-TARGET = simulator_fs9
+TARGET = simulatorfs9
 TEMPLATE = lib
 
 CONFIG += plugin shared

src/plugins/simulator/fscommon/fscommon.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus concurrent xml
 
-TARGET = simulator_fscommon
+TARGET = simulatorfscommon
 TEMPLATE = lib
 
 CONFIG += staticlib

src/plugins/simulator/fsx/fsx.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus gui network concurrent xml
 
-TARGET = simulator_fsx
+TARGET = simulatorfsx
 TEMPLATE = lib
 
 CONFIG += plugin shared

src/plugins/simulator/fsxconfig/fsxconfig.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core widgets dbus network
 
-TARGET = simulator_fsx_config
+TARGET = simulatorfsxconfig
 TEMPLATE = lib
 CONFIG += plugin shared
 CONFIG += blackmisc blackcore blackgui

src/plugins/simulator/simulator.pro

@@ -0,0 +1,23 @@
+load(common_pre)
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+win32 {
+    if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) {
+        SUBDIRS += fscommon
+    }
+
+    contains(BLACK_CONFIG, FSX) {
+        SUBDIRS += fsx
+        SUBDIRS += fsxconfig
+    }
+    contains(BLACK_CONFIG, FS9) {
+        SUBDIRS += fs9
+    }
+}
+
+contains(BLACK_CONFIG, XPlane) {
+    SUBDIRS += xplane
+    SUBDIRS += xplaneconfig
+}

src/plugins/simulator/xplane/simulatorxplane.h

@@ -17,7 +17,7 @@
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/pixmap.h"
-#include "plugins/simulator/xplane_config/simulatorxplaneconfig.h"
+#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
 #include <QDBusConnection>
 
 class QDBusServiceWatcher;

src/plugins/simulator/xplane/xplane.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus network
 
-TARGET = simulator_xplane
+TARGET = simulatorxplane
 TEMPLATE = lib
 
 CONFIG += plugin shared

src/plugins/simulator/xplaneconfig/xplaneconfig.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core widgets dbus
 
-TARGET = simulator_xplane_config
+TARGET = simulatorxplaneconfig
 TEMPLATE = lib
 
 CONFIG += plugin shared