diff options
| author | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-09-29 19:56:37 +0200 |
|---|---|---|
| committer | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-09-29 20:06:07 +0200 |
| commit | 9292fa44f4c8d58aa365b4389be040584a17c893 (patch) | |
| tree | 0a6394f00b022bd291d15b5879f04fac8ec19611 | |
| parent | 8d8ac2451556df63746898aafeac61301642d0c5 (diff) | |
| download | qtwebsockets-9292fa44f4c8d58aa365b4389be040584a17c893.tar.gz | |
update _global file, to match Qt default
Change-Id: I4bbf6bd60abd93bd18947b8d2a9d42784aaea10b
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| -rw-r--r-- | src/websockets/qwebsocket.h | 3 | ||||
| -rw-r--r-- | src/websockets/qwebsocket_p.h | 1 | ||||
| -rw-r--r-- | src/websockets/qwebsocketcorsauthenticator.h | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsockets_global.h (renamed from src/websockets/qwebsocketsglobal.h) | 0 | ||||
| -rw-r--r-- | src/websockets/qwebsocketserver.h | 2 | ||||
| -rw-r--r-- | src/websockets/websockets.pro | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index b63bb12..b03820c 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -24,7 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #ifndef QT_NO_NETWORKPROXY #include <QNetworkProxy> #endif -#include "qwebsocketsglobal.h" + +#include "qwebsockets_global.h" #include "qwebsocketprotocol.h" QT_BEGIN_NAMESPACE diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index fb1f17e..a6b8e7d 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #endif #include <QTime> -#include "qwebsocketsglobal.h" #include "qwebsocketprotocol.h" #include "qwebsocketdataprocessor_p.h" diff --git a/src/websockets/qwebsocketcorsauthenticator.h b/src/websockets/qwebsocketcorsauthenticator.h index 7f3bbd1..cd9d60c 100644 --- a/src/websockets/qwebsocketcorsauthenticator.h +++ b/src/websockets/qwebsocketcorsauthenticator.h @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #ifndef QWEBSOCKETCORSAUTHENTICATOR_H #define QWEBSOCKETCORSAUTHENTICATOR_H -#include "qwebsocketsglobal.h" +#include "qwebsockets_global.h" QT_BEGIN_NAMESPACE diff --git a/src/websockets/qwebsocketsglobal.h b/src/websockets/qwebsockets_global.h index 8b902af..8b902af 100644 --- a/src/websockets/qwebsocketsglobal.h +++ b/src/websockets/qwebsockets_global.h diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 3dc3379..99d61ad 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <QObject> #include <QString> #include <QHostAddress> -#include "qwebsocketsglobal.h" +#include "qwebsockets_global.h" #include "qwebsocketprotocol.h" QT_BEGIN_NAMESPACE diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro index 7d0f4a2..e7d6bbc 100644 --- a/src/websockets/websockets.pro +++ b/src/websockets/websockets.pro @@ -11,10 +11,10 @@ load(qt_module) QMAKE_DOCS = $$PWD/doc/qwebsockets.qdocconfig PUBLIC_HEADERS += \ + $$PWD/qwebsockets_global.h \ $$PWD/qwebsocket.h \ $$PWD/qwebsocketserver.h \ $$PWD/qwebsocketprotocol.h \ - $$PWD/qwebsocketsglobal.h \ $$PWD/qwebsocketcorsauthenticator.h PRIVATE_HEADERS += \ |