summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Uusi-Rantala <jani.uusi-rantala@nokia.com>2012-06-08 10:53:34 +0300
committerAndrew Christian <andrew.christian@nokia.com>2012-06-08 12:30:18 +0200
commit838117892160ddb5b7123a618111ebebd4f077cf (patch)
tree7df930b99cd169b221aab2563e47be21e8f480ab
parent2beb33bc03b3b83aeaf83e1a5b0919c5f1ab3bef (diff)
GCC 4.7 compilation fixes
Many of the standard library includes have removed unistd.h. See http://gcc.gnu.org/gcc-4.7/porting_to.html for more info. Change-Id: I538663274077a0d21c05af0291c96acd6e40f71d Reviewed-by: Andrew Christian <andrew.christian@nokia.com>
-rw-r--r--src/jsonbuffer.cpp2
-rw-r--r--src/jsonpipe.cpp1
-rw-r--r--tests/auto/jsonconnection/test/test.pro2
-rw-r--r--tests/auto/jsonstream/tst_jsonstream.cpp2
4 files changed, 6 insertions, 1 deletions
diff --git a/src/jsonbuffer.cpp b/src/jsonbuffer.cpp
index fbabb85..f34fd24 100644
--- a/src/jsonbuffer.cpp
+++ b/src/jsonbuffer.cpp
@@ -45,6 +45,8 @@
#include <QTextCodec>
#include <QMutexLocker>
+#include <unistd.h> // for ::read
+
#include "jsonbuffer_p.h"
#include "qjsondocument.h"
#include "qjsonobject.h"
diff --git a/src/jsonpipe.cpp b/src/jsonpipe.cpp
index dd0fa78..bd63de3 100644
--- a/src/jsonpipe.cpp
+++ b/src/jsonpipe.cpp
@@ -50,6 +50,7 @@
#include <sys/select.h>
#include <stdio.h>
#include <errno.h>
+#include <unistd.h> // for ::write
#include "jsonpipe.h"
#include "jsonbuffer_p.h"
diff --git a/tests/auto/jsonconnection/test/test.pro b/tests/auto/jsonconnection/test/test.pro
index bcf1e01..a03160f 100644
--- a/tests/auto/jsonconnection/test/test.pro
+++ b/tests/auto/jsonconnection/test/test.pro
@@ -1,7 +1,7 @@
CONFIG += testcase
CONFIG -= app_bundle
-QT = jsonstream testlib qml
+QT = jsonstream testlib qml quick
SOURCES = ../tst_jsonconnection.cpp
TARGET = ../tst_jsonconnection
diff --git a/tests/auto/jsonstream/tst_jsonstream.cpp b/tests/auto/jsonstream/tst_jsonstream.cpp
index 4ec119b..9a789be 100644
--- a/tests/auto/jsonstream/tst_jsonstream.cpp
+++ b/tests/auto/jsonstream/tst_jsonstream.cpp
@@ -49,6 +49,8 @@
#include "jsonuidrangeauthority.h"
#include "schemavalidator.h"
+#include <unistd.h>
+
QT_USE_NAMESPACE_JSONSTREAM
Q_DECLARE_METATYPE(QJsonObject);