diff options
-rw-r--r-- | examples/echoclient/echoclient.pro | 3 | ||||
-rw-r--r-- | examples/echoserver/echoserver.pro | 3 | ||||
-rw-r--r-- | tests/unittests.pro | 29 |
3 files changed, 10 insertions, 25 deletions
diff --git a/examples/echoclient/echoclient.pro b/examples/echoclient/echoclient.pro index e69a6a0..ad4daff 100644 --- a/examples/echoclient/echoclient.pro +++ b/examples/echoclient/echoclient.pro @@ -9,7 +9,8 @@ TEMPLATE = app include(../../src/qwebsocket.pri) -SOURCES += main.cpp \ +SOURCES += \ + main.cpp \ echoclient.cpp HEADERS += \ diff --git a/examples/echoserver/echoserver.pro b/examples/echoserver/echoserver.pro index 04880ff..8e5f08d 100644 --- a/examples/echoserver/echoserver.pro +++ b/examples/echoserver/echoserver.pro @@ -9,7 +9,8 @@ TEMPLATE = app include(../../src/qwebsocket.pri) -SOURCES += main.cpp \ +SOURCES += \ + main.cpp \ echoserver.cpp HEADERS += \ diff --git a/tests/unittests.pro b/tests/unittests.pro index fb863ab..cfdbb30 100644 --- a/tests/unittests.pro +++ b/tests/unittests.pro @@ -1,27 +1,16 @@ cache() -# Determine the platform: if using a cross-compiler -> add it to the config flags. -!contains(QMAKE_CXX, g++) { - CONFIG += embedded -} QT += core network -CONFIG += c++11 -embedded { # Vanilla Qt libraries are differently deployed then the dev libraries of Debian. - QT += multimedia -} -CONFIG += mobility -MOBILITY = multimedia - -unix:!macx { - QT += dbus -} +TARGET = unittests +CONFIG += console +CONFIG += c++11 +CONFIG -= app_bundle +TEMPLATE = app include(../src/qwebsocket.pri) -#include(../source/buildsystem/buildsystem.pri) - # Remove the main.cpp file from the sources. S = $$SOURCES SOURCES = \ @@ -35,7 +24,7 @@ for(F, S) { SOURCES += \ main.cpp \ - tst_websockets.cpp + tst_websockets.cpp HEADERS += \ unittests.h @@ -45,10 +34,4 @@ DEPENDPATH += QT += testlib -TARGET = unittests -CONFIG += console -CONFIG -= app_bundle - -TEMPLATE = app - DEFINES += SRCDIR=\\\"$$PWD/\\\" |