diff options
| author | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-09-27 14:27:27 +0200 |
|---|---|---|
| committer | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-09-28 21:17:48 +0200 |
| commit | 6e1e387174d20fb62a804b6e27438bcc5ea59f28 (patch) | |
| tree | 68d5c273ea682a244398ba8d3c7fbeb4a5f76b9b /tests/tests.pro | |
| parent | 315e4fa0764f8d7a568be2a8063cc33c9ec13518 (diff) | |
| download | qtwebsockets-6e1e387174d20fb62a804b6e27438bcc5ea59f28.tar.gz | |
Changes to integrate the websocket module as a full Qt Add-On module
- Changed project files to use Qt structure
- Moved existing sources into subdirectory, to make room for moduels
- Created a "import/qmlwebsocket" module skeleton (works, but needs to be extended)
- Modified examples to not use "include(.pri)", but use "QT += websocket"
- Added qml example skeleton (works, but no useful functionality yet)
Project can be build with:
$ qmake
$ make
$ make install
Module can be used in other projects with
QT += websockets
Change-Id: I2123026958b264670dbf8a978dee76edf5855806
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'tests/tests.pro')
| -rw-r--r-- | tests/tests.pro | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/tests/tests.pro b/tests/tests.pro index dc855d1..9cd3320 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,6 +1,6 @@ cache() -QT += core network testlib +QT += core network websockets testlib TARGET = unittests CONFIG += testcase @@ -10,19 +10,6 @@ CONFIG -= app_bundle TEMPLATE = app -mac:QMAKE_CXXFLAGS += -Wall -Werror -Wextra - -include(../src/qwebsockets.pri) - -# Remove the main.cpp file from the sources. -#S = $$SOURCES -#for(F, S) { -# M = $$find(F, main.cpp) -# count(M, 0) { -# SOURCES += $$F -# } -#} - SOURCES += \ main.cpp \ tst_websockets.cpp \ @@ -32,7 +19,4 @@ SOURCES += \ HEADERS += \ unittests.h -INCLUDEPATH += -DEPENDPATH += - DEFINES += SRCDIR=\\\"$$PWD/\\\" |