summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2013-08-25 13:48:10 +0200
committerKurt Pattyn <pattyn.kurt@gmail.com>2013-08-25 13:48:10 +0200
commit4a4fb078c955e84ea48c7a83809f98fe23057836 (patch)
tree4f5f3b3cd3377edc2ac3a3a47e37ad622ac2b9fb
parent4de3b54c254b0e11efae82f3e7fc70da664ffd80 (diff)
downloadqtwebsockets-4a4fb078c955e84ea48c7a83809f98fe23057836.tar.gz
Renamed websocket.pri to qwebsocket.pri
-rw-r--r--examples/echoclient/echoclient.pro2
-rw-r--r--examples/echoserver/echoserver.pro2
-rw-r--r--src/qwebsocket.pri (renamed from src/websocket.pri)0
-rw-r--r--tests/unittests.pro2
4 files changed, 3 insertions, 3 deletions
diff --git a/examples/echoclient/echoclient.pro b/examples/echoclient/echoclient.pro
index 5f5bfa0..e69a6a0 100644
--- a/examples/echoclient/echoclient.pro
+++ b/examples/echoclient/echoclient.pro
@@ -7,7 +7,7 @@ CONFIG -= app_bundle
TEMPLATE = app
-include(../../src/websocket.pri)
+include(../../src/qwebsocket.pri)
SOURCES += main.cpp \
echoclient.cpp
diff --git a/examples/echoserver/echoserver.pro b/examples/echoserver/echoserver.pro
index ed0d038..04880ff 100644
--- a/examples/echoserver/echoserver.pro
+++ b/examples/echoserver/echoserver.pro
@@ -7,7 +7,7 @@ CONFIG -= app_bundle
TEMPLATE = app
-include(../../src/websocket.pri)
+include(../../src/qwebsocket.pri)
SOURCES += main.cpp \
echoserver.cpp
diff --git a/src/websocket.pri b/src/qwebsocket.pri
index 55d1e79..55d1e79 100644
--- a/src/websocket.pri
+++ b/src/qwebsocket.pri
diff --git a/tests/unittests.pro b/tests/unittests.pro
index 743cc21..fb863ab 100644
--- a/tests/unittests.pro
+++ b/tests/unittests.pro
@@ -18,7 +18,7 @@ unix:!macx {
}
-include(../src/websocket.pri)
+include(../src/qwebsocket.pri)
#include(../source/buildsystem/buildsystem.pri)