Sanitize .pro files

Remove c++11 config flag if not necessary
Remove mac specific compiler settings

Change-Id: If3cb4c5396f6dd5679a9fc8cf8f8a81c34ad6f4c
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

diff --git a/examples/echoclient/echoclient.pro b/examples/echoclient/echoclient.pro
index f6891ef..24848e7 100644 (file)
--- a/examples/echoclient/echoclient.pro
+++ b/examples/echoclient/echoclient.pro
@@ -5,8 +5,6 @@ TARGET = echoclient
 CONFIG   += console
 CONFIG   -= app_bundle
 
-mac:QMAKE_CXXFLAGS += -Wall -Werror -Wextra
-
 TEMPLATE = app
 
 SOURCES += \

diff --git a/examples/echoserver/echoserver.pro b/examples/echoserver/echoserver.pro
index d2edcae..2f10bfc 100644 (file)
--- a/examples/echoserver/echoserver.pro
+++ b/examples/echoserver/echoserver.pro
@@ -5,8 +5,6 @@ TARGET = echoserver
 CONFIG   += console
 CONFIG   -= app_bundle
 
-mac:QMAKE_CXXFLAGS += -Wall -Werror -Wextra
-
 TEMPLATE = app
 
 SOURCES += \

diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro
index 25944f1..84bf8e3 100644 (file)
--- a/src/websockets/websockets.pro
+++ b/src/websockets/websockets.pro
@@ -1,7 +1,7 @@
 load(qt_build_config)
 TARGET = QtWebSockets
 
-QT += core network
+QT = core network
 
 TEMPLATE = lib
 

diff --git a/tests/auto/dataprocessor/dataprocessor.pro b/tests/auto/dataprocessor/dataprocessor.pro
index 7db9f47..ac5ba5c 100644 (file)
--- a/tests/auto/dataprocessor/dataprocessor.pro
+++ b/tests/auto/dataprocessor/dataprocessor.pro
@@ -1,5 +1,4 @@
 CONFIG += console
-CONFIG += c++11
 CONFIG += testcase
 CONFIG -= app_bundle
 

diff --git a/tests/auto/handshakerequest/handshakerequest.pro b/tests/auto/handshakerequest/handshakerequest.pro
index 0f4401e..d887cd6 100644 (file)
--- a/tests/auto/handshakerequest/handshakerequest.pro
+++ b/tests/auto/handshakerequest/handshakerequest.pro
@@ -1,5 +1,4 @@
 CONFIG += console
-CONFIG += c++11
 CONFIG += testcase
 CONFIG -= app_bundle
 

diff --git a/tests/auto/websocketcorsauthenticator/websocketcorsauthenticator.pro b/tests/auto/websocketcorsauthenticator/websocketcorsauthenticator.pro
index 5ea16ab..dddec22 100644 (file)
--- a/tests/auto/websocketcorsauthenticator/websocketcorsauthenticator.pro
+++ b/tests/auto/websocketcorsauthenticator/websocketcorsauthenticator.pro
@@ -1,5 +1,4 @@
 CONFIG += console
-CONFIG += c++11
 CONFIG += testcase
 CONFIG -= app_bundle
 

diff --git a/tests/auto/websocketframe/websocketframe.pro b/tests/auto/websocketframe/websocketframe.pro
index d18aa7d..9682348 100644 (file)
--- a/tests/auto/websocketframe/websocketframe.pro
+++ b/tests/auto/websocketframe/websocketframe.pro
@@ -1,5 +1,4 @@
 CONFIG += console
-CONFIG += c++11
 CONFIG += testcase
 CONFIG -= app_bundle
 

diff --git a/tests/auto/websocketprotocol/websocketprotocol.pro b/tests/auto/websocketprotocol/websocketprotocol.pro
index bb0ab3b..c21bb64 100644 (file)
--- a/tests/auto/websocketprotocol/websocketprotocol.pro
+++ b/tests/auto/websocketprotocol/websocketprotocol.pro
@@ -1,5 +1,4 @@
 CONFIG += console
-CONFIG += c++11
 CONFIG += testcase
 CONFIG -= app_bundle