fixed compile errors caused by inconsistencies between merged branches

This commit is contained in:
Mathew Sutcliffe
2013-08-29 00:02:47 +01:00
parent 20c33bf77c
commit a011bb18e6
6 changed files with 7 additions and 10 deletions

View File

@@ -1,10 +1,10 @@
QT += core
QT += core dbus
QT -= gui
TARGET = sample_cli_client
TEMPLATE = app
CONFIG += console
CONFIG += console c++11
CONFIG -= app_bundle
DEPENDPATH += . ../../src