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
This commit is contained in:
Roland Winklmeier
2015-11-23 09:50:44 +01:00
parent 097b4d900c
commit 7ece093ee9
47 changed files with 111 additions and 77 deletions

View File

@@ -2,7 +2,7 @@ load(common_pre)
QT += core dbus network
TARGET = sample_blackmisc
TARGET = sampleblackmisc
TEMPLATE = app
CONFIG += console

View File

@@ -2,7 +2,7 @@ load(common_pre)
QT += core dbus network
TARGET = sample_blackmisc_dbus
TARGET = sampleblackmiscdbus
TEMPLATE = app
CONFIG += console

View File

@@ -9,7 +9,7 @@
#include "servicetool.h"
#include "testservice.h"
#include "testservice_interface.h"
#include "testserviceinterface.h"
#include "blackcore/dbusserver.h"
#include <QTextStream>

View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "testservice_interface.h"
#include "testserviceinterface.h"
namespace BlackMiscTest
{

View File

@@ -2,7 +2,7 @@ load(common_pre)
QT += core dbus network
TARGET = sample_quantities_aviation
TARGET = sampleblackmiscquantities
TEMPLATE = app
CONFIG += console

View File

@@ -2,7 +2,7 @@ load(common_pre)
QT += core dbus network xml
TARGET = sample_blacksim
TARGET = sampleblackmiscsim
TEMPLATE = app
CONFIG += console

View File

@@ -2,7 +2,7 @@ load(common_pre)
QT += core dbus network
TARGET = sample_cli_client
TARGET = samplecliclient
TEMPLATE = app
CONFIG += console

View File

@@ -4,7 +4,7 @@ QT += core gui dbus network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = sample_hotkey
TARGET = samplehotkey
TEMPLATE = app
CONFIG -= app_bundle

11
samples/samples.pro Normal file
View File

@@ -0,0 +1,11 @@
load(common_pre)
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += cliclient
SUBDIRS += blackmiscquantities
SUBDIRS += blackmiscdbus
SUBDIRS += blackmisc
SUBDIRS += blackmiscsim
SUBDIRS += hotkey