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>

diff --git a/.gitignore b/.gitignore
index 3425f4b..218d86e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,6 @@
 *.dylib
 *.obj
 Makefile*
-moc_*.cpp
-*.moc
 
 # Directories to ignore
 # ---------------------
@@ -34,19 +32,28 @@ build-unittests-Qt_5_1_0_clang_64-Debug/unittests
 build-unittests-Qt_5_1_0_clang_64-Release/unittests
 examples/.coverity-submit
 
-reports
-doc/html
-build-examples-Qt_5_1_0_clang_64_temporary-Debug
-build-unittests-Qt_5_1_0_clang_64-Release
-src/doc/html
+# Qt specific
 .qmake.cache
-examples/echoclient/echoclient
-src/libQWebSockets.0.9.0.dylib
-src/libQWebSockets.0.9.dylib
-src/libQWebSockets.0.dylib
-src/libQWebSockets.1.0.0.dylib
-src/libQWebSockets.1.0.dylib
-src/libQWebSockets.1.dylib
-src/libQWebSockets.dylib
-examples/echoserver/echoserver
-tests/unittests
+*.pro.user
+*.pro.shared
+moc_*.cpp
+*.moc
+*_resource.rc
+ui_*.h
+qrc_*.cpp
+
+*~
+*.pdb
+*.exe
+*.lib
+*.res
+*.exp
+*.manifest
+config.log
+tmp
+imports/*
+include
+tests/auto/cmake/build
+lib/
+mkspecs/
+qml/

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644 (file)
index 0000000..4fb101b
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1,5 @@
+load(qt_build_config)
+
+CONFIG += qt_example_installs
+
+MODULE_VERSION = 5.1.1

diff --git a/examples/echoclient/echoclient.pro b/examples/echoclient/echoclient.pro
index 565eea3..f6891ef 100644 (file)
--- a/examples/echoclient/echoclient.pro
+++ b/examples/echoclient/echoclient.pro
@@ -1,4 +1,4 @@
-QT       += core
+QT       += core websockets
 QT       -= gui
 
 TARGET = echoclient
@@ -9,8 +9,6 @@ mac:QMAKE_CXXFLAGS += -Wall -Werror -Wextra
 
 TEMPLATE = app
 
-include(../../src/qwebsockets.pri)
-
 SOURCES += \
     main.cpp \
     echoclient.cpp

diff --git a/examples/echoserver/echoserver.pro b/examples/echoserver/echoserver.pro
index 913cb6e..d2edcae 100644 (file)
--- a/examples/echoserver/echoserver.pro
+++ b/examples/echoserver/echoserver.pro
@@ -1,4 +1,4 @@
-QT       += core
+QT       += core websockets
 QT       -= gui
 
 TARGET = echoserver
@@ -9,8 +9,6 @@ mac:QMAKE_CXXFLAGS += -Wall -Werror -Wextra
 
 TEMPLATE = app
 
-include(../../src/qwebsockets.pri)
-
 SOURCES += \
     main.cpp \
     echoserver.cpp

diff --git a/examples/examples.pro b/examples/examples.pro
index b350436..653df67 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,5 +1,5 @@
-cache()
 TEMPLATE = subdirs
 
-SUBDIRS =      echoclient \
-                       echoserver
+SUBDIRS = echoclient \
+        echoserver \
+        qmlwebsocketclient

diff --git a/examples/qmlwebsocketclient/data.qrc b/examples/qmlwebsocketclient/data.qrc
new file mode 100644 (file)
index 0000000..3ac4604
--- /dev/null
+++ b/examples/qmlwebsocketclient/data.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/qmlwebsocketclient/main.qml</file>
+    </qresource>
+</RCC>

diff --git a/examples/qmlwebsocketclient/main.cpp b/examples/qmlwebsocketclient/main.cpp
new file mode 100644 (file)
index 0000000..1df79e3
--- /dev/null
+++ b/examples/qmlwebsocketclient/main.cpp
@@ -0,0 +1,32 @@
+/*
+QWebSockets implements the WebSocket protocol as defined in RFC 6455.
+Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <QtGui/QGuiApplication>
+#include <QQuickView>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    QQuickView view;
+    view.setSource(QUrl(QStringLiteral("qrc:/qml/qmlwebsocketclient/main.qml")));
+    view.show();
+
+    return app.exec();
+}

diff --git a/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml b/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
new file mode 100644 (file)
index 0000000..7c227a4
--- /dev/null
+++ b/examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
@@ -0,0 +1,42 @@
+/*
+QWebSockets implements the WebSocket protocol as defined in RFC 6455.
+Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+import QtQuick 2.0
+import Qt.Playground.WebSockets 1.0
+
+Rectangle {
+    width: 360
+    height: 360
+
+    WebSocket {
+
+    }
+
+    Text {
+        text: qsTr("Hello World")
+        anchors.centerIn: parent
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            Qt.quit();
+        }
+    }
+}

diff --git a/examples/qmlwebsocketclient/qmlwebsocketclient.pro b/examples/qmlwebsocketclient/qmlwebsocketclient.pro
new file mode 100644 (file)
index 0000000..e4a7d13
--- /dev/null
+++ b/examples/qmlwebsocketclient/qmlwebsocketclient.pro
@@ -0,0 +1,11 @@
+QT += qml quick
+
+TARGET = qmlwebsocketclient
+
+CONFIG   -= app_bundle
+
+SOURCES += main.cpp
+
+RESOURCES += \
+    data.qrc
+

diff --git a/qwebsockets.pro b/qwebsockets.pro
deleted file mode 100644 (file)
index 3c981a3..0000000
--- a/qwebsockets.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-cache()
-TEMPLATE = subdirs
-
-SUBDIRS =      \
-            src \
-            examples \
-            tests
-CONFIG += ordered

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
new file mode 100644 (file)
index 0000000..6bf8069
--- /dev/null
+++ b/src/imports/imports.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += qmlwebsockets

diff --git a/src/imports/qmlwebsockets/qmldir b/src/imports/qmlwebsockets/qmldir
new file mode 100644 (file)
index 0000000..549c286
--- /dev/null
+++ b/src/imports/qmlwebsockets/qmldir
@@ -0,0 +1,3 @@
+module Qt.Playground.WebSockets
+
+plugin declarative_qmlwebsockets

diff --git a/src/imports/qmlwebsockets/qmlwebsockets.pro b/src/imports/qmlwebsockets/qmlwebsockets.pro
new file mode 100644 (file)
index 0000000..fc25714
--- /dev/null
+++ b/src/imports/qmlwebsockets/qmlwebsockets.pro
@@ -0,0 +1,11 @@
+QT += websockets qml
+
+TARGETPATH = Qt/Playground/WebSockets
+
+HEADERS += qmlwebsockets_plugin.h \
+    qqmlwebsocket.h
+
+SOURCES += qmlwebsockets_plugin.cpp \
+    qqmlwebsocket.cpp
+
+load(qml_plugin)

diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
new file mode 100644 (file)
index 0000000..d757348
--- /dev/null
+++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
@@ -0,0 +1,34 @@
+/*
+QWebSockets implements the WebSocket protocol as defined in RFC 6455.
+Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "qmlwebsockets_plugin.h"
+
+#include <QtQml>
+
+void QmlWebsocket_plugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Qt.Playground.WebSockets"));
+
+    int major = 1;
+    int minor = 0;
+
+    // @uri Qt.Playground.WebSockets
+
+    qmlRegisterType<QQmlWebSocket>(uri, major, minor, "WebSocket");
+}

diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
new file mode 100644 (file)
index 0000000..cdb805f
--- /dev/null
+++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
@@ -0,0 +1,40 @@
+/*
+QWebSockets implements the WebSocket protocol as defined in RFC 6455.
+Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef QMLWEBSOCKET_PLUGIN_H
+#define QMLWEBSOCKET_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+#include "qqmlwebsocket.h"
+
+QT_BEGIN_NAMESPACE
+
+class QmlWebsocket_plugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+QT_END_NAMESPACE
+
+#endif // QMLWEBSOCKET_PLUGIN_H

diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp
new file mode 100644 (file)
index 0000000..72b1810
--- /dev/null
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp
@@ -0,0 +1,35 @@
+/*
+QWebSockets implements the WebSocket protocol as defined in RFC 6455.
+Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "qqmlwebsocket.h"
+
+QQmlWebSocket::QQmlWebSocket(QObject *parent) :
+    QObject(parent)
+{
+}
+
+void QQmlWebSocket::classBegin()
+{
+
+}
+
+void QQmlWebSocket::componentComplete()
+{
+
+}

diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
new file mode 100644 (file)
index 0000000..9b95c28
--- /dev/null
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@ -0,0 +1,40 @@
+/*
+QWebSockets implements the WebSocket protocol as defined in RFC 6455.
+Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef QQMLWEBSOCKET_H
+#define QQMLWEBSOCKET_H
+
+#include <QObject>
+#include <QQmlParserStatus>
+
+class QQmlWebSocket : public QObject, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(QQmlWebSocket)
+    Q_INTERFACES(QQmlParserStatus)
+
+public:
+    explicit QQmlWebSocket(QObject *parent = 0);
+
+public:
+    void classBegin() Q_DECL_OVERRIDE;
+    void componentComplete() Q_DECL_OVERRIDE;
+};
+
+#endif // QQMLWEBSOCKET_H

diff --git a/src/qwebsockets.pro b/src/qwebsockets.pro
deleted file mode 100644 (file)
index 0480ec3..0000000
--- a/src/qwebsockets.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-QMAKE_DOCS = $$PWD/doc/qwebsockets.qdocconfig
-
-include($$PWD/qwebsockets.pri)
-
-TEMPLATE = lib
-VERSION = 0.9
-TARGET = QWebSockets
-
-mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$TARGET
-mac:QMAKE_CXXFLAGS += -Wall -Werror -Wextra

diff --git a/src/src.pro b/src/src.pro
index e975a6b..759b5ba 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1 +1,3 @@
-include ($$PWD/qwebsockets.pro)
+TEMPLATE = subdirs
+
+SUBDIRS += websockets imports

diff --git a/src/dataprocessor_p.cpp b/src/websockets/dataprocessor_p.cpp
similarity index 100%
rename from src/dataprocessor_p.cpp
rename to src/websockets/dataprocessor_p.cpp

diff --git a/src/dataprocessor_p.h b/src/websockets/dataprocessor_p.h
similarity index 100%
rename from src/dataprocessor_p.h
rename to src/websockets/dataprocessor_p.h

diff --git a/src/doc/qwebsockets.qdoc b/src/websockets/doc/qwebsockets.qdoc
similarity index 100%
rename from src/doc/qwebsockets.qdoc
rename to src/websockets/doc/qwebsockets.qdoc

diff --git a/src/doc/qwebsockets.qdocconfig b/src/websockets/doc/qwebsockets.qdocconfig
similarity index 100%
rename from src/doc/qwebsockets.qdocconfig
rename to src/websockets/doc/qwebsockets.qdocconfig

diff --git a/src/handshakerequest_p.cpp b/src/websockets/handshakerequest_p.cpp
similarity index 100%
rename from src/handshakerequest_p.cpp
rename to src/websockets/handshakerequest_p.cpp

diff --git a/src/handshakerequest_p.h b/src/websockets/handshakerequest_p.h
similarity index 100%
rename from src/handshakerequest_p.h
rename to src/websockets/handshakerequest_p.h

diff --git a/src/handshakeresponse_p.cpp b/src/websockets/handshakeresponse_p.cpp
similarity index 100%
rename from src/handshakeresponse_p.cpp
rename to src/websockets/handshakeresponse_p.cpp

diff --git a/src/handshakeresponse_p.h b/src/websockets/handshakeresponse_p.h
similarity index 100%
rename from src/handshakeresponse_p.h
rename to src/websockets/handshakeresponse_p.h

diff --git a/src/qcorsauthenticator.cpp b/src/websockets/qcorsauthenticator.cpp
similarity index 100%
rename from src/qcorsauthenticator.cpp
rename to src/websockets/qcorsauthenticator.cpp

diff --git a/src/qcorsauthenticator.h b/src/websockets/qcorsauthenticator.h
similarity index 100%
rename from src/qcorsauthenticator.h
rename to src/websockets/qcorsauthenticator.h

diff --git a/src/qcorsauthenticator_p.h b/src/websockets/qcorsauthenticator_p.h
similarity index 100%
rename from src/qcorsauthenticator_p.h
rename to src/websockets/qcorsauthenticator_p.h

diff --git a/src/qwebsocket.cpp b/src/websockets/qwebsocket.cpp
similarity index 100%
rename from src/qwebsocket.cpp
rename to src/websockets/qwebsocket.cpp

diff --git a/src/qwebsocket.h b/src/websockets/qwebsocket.h
similarity index 100%
rename from src/qwebsocket.h
rename to src/websockets/qwebsocket.h

diff --git a/src/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
similarity index 100%
rename from src/qwebsocket_p.cpp
rename to src/websockets/qwebsocket_p.cpp

diff --git a/src/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
similarity index 100%
rename from src/qwebsocket_p.h
rename to src/websockets/qwebsocket_p.h

diff --git a/src/qwebsocketprotocol.cpp b/src/websockets/qwebsocketprotocol.cpp
similarity index 100%
rename from src/qwebsocketprotocol.cpp
rename to src/websockets/qwebsocketprotocol.cpp

diff --git a/src/qwebsocketprotocol.h b/src/websockets/qwebsocketprotocol.h
similarity index 100%
rename from src/qwebsocketprotocol.h
rename to src/websockets/qwebsocketprotocol.h

diff --git a/src/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp
similarity index 100%
rename from src/qwebsocketserver.cpp
rename to src/websockets/qwebsocketserver.cpp

diff --git a/src/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
similarity index 100%
rename from src/qwebsocketserver.h
rename to src/websockets/qwebsocketserver.h

diff --git a/src/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
similarity index 100%
rename from src/qwebsocketserver_p.cpp
rename to src/websockets/qwebsocketserver_p.cpp

diff --git a/src/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h
similarity index 100%
rename from src/qwebsocketserver_p.h
rename to src/websockets/qwebsocketserver_p.h

diff --git a/src/qwebsocketsglobal.h b/src/websockets/qwebsocketsglobal.h
similarity index 100%
rename from src/qwebsocketsglobal.h
rename to src/websockets/qwebsocketsglobal.h

diff --git a/src/qwebsockets.pri b/src/websockets/websockets.pro
similarity index 59%
rename from src/qwebsockets.pri
rename to src/websockets/websockets.pro
index c701c93..69ddc9c 100644 (file)
--- a/src/qwebsockets.pri
+++ b/src/websockets/websockets.pro
@@ -1,4 +1,29 @@
-QT       *= network
+QT += network
+
+TARGET = QtWebSockets
+
+TEMPLATE += lib
+
+DEFINES += QTWEBSOCKETS_LIBRARY
+
+load(qt_module)
+
+QMAKE_DOCS = $$PWD/doc/qwebsockets.qdocconfig
+
+PUBLIC_HEADERS += \
+    $$PWD/qwebsocket.h \
+    $$PWD/qwebsocketserver.h \
+    $$PWD/qwebsocketprotocol.h \
+    $$PWD/qwebsocketsglobal.h \
+    $$PWD/qcorsauthenticator.h
+
+PRIVATE_HEADERS += \
+    $$PWD/qwebsocket_p.h \
+    $$PWD/qwebsocketserver_p.h \
+    $$PWD/handshakerequest_p.h \
+    $$PWD/handshakeresponse_p.h \
+    $$PWD/dataprocessor_p.h \
+    $$PWD/qcorsauthenticator_p.h
 
 SOURCES += \
     $$PWD/qwebsocket.cpp \
@@ -11,18 +36,10 @@ SOURCES += \
     $$PWD/dataprocessor_p.cpp \
     $$PWD/qcorsauthenticator.cpp
 
-HEADERS += \
-    $$PWD/qwebsocket.h \
-    $$PWD/qwebsocket_p.h \
-    $$PWD/qwebsocketserver.h \
-    $$PWD/qwebsocketserver_p.h \
-    $$PWD/qwebsocketprotocol.h \
-    $$PWD/handshakerequest_p.h \
-    $$PWD/handshakeresponse_p.h \
-    $$PWD/dataprocessor_p.h \
-    $$PWD/qwebsocketsglobal.h \
-    $$PWD/qcorsauthenticator.h \
-    qcorsauthenticator_p.h
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+#mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$TARGET
+#mac:QMAKE_CXXFLAGS += -Wall -Werror -Wextra
+
+
 
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD

diff --git a/sync.profile b/sync.profile
index 7933ae7..b26d76c 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,12 @@
 %modules = (
-       "QWebSockets" => "$basedir/src",
+    "QtWebSockets" => "$basedir/src/websockets",
+);
+
+%moduleheaders = (
+);
+
+%classnames = (
+    "qtwebsockets.h" => "QtWebSockets",
 );
 
 %dependencies = (

diff --git a/tests/tests.pro b/tests/tests.pro
index dc855d1..9cd3320 100644 (file)
--- 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/\\\"

diff --git a/websockets.pro b/websockets.pro
new file mode 100644 (file)
index 0000000..58c33f2
--- /dev/null
+++ b/websockets.pro
@@ -0,0 +1 @@
+load(qt_parts)