misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/io/qurl.cpp b/src/core/io/qurl.cpp
index abb3964..4776c57 100644 (file)
--- a/src/core/io/qurl.cpp
+++ b/src/core/io/qurl.cpp
@@ -248,9 +248,6 @@ static QString fromPercentEncodingMutable(QByteArray *ba)
 
 //#define QURL_DEBUG
 
-// implemented in qvsnprintf.cpp
-Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
-
 // needed by the punycode encoder/decoder
 #define Q_MAXINT ((uint)((uint)(-1)>>1))
 static const uint base = 36;

diff --git a/src/core/thread/qreadwritelock.h b/src/core/thread/qreadwritelock.h
index a322cb3..e7b525f 100644 (file)
--- a/src/core/thread/qreadwritelock.h
+++ b/src/core/thread/qreadwritelock.h
@@ -43,7 +43,6 @@
 #define QREADWRITELOCK_H
 
 #include <QtCore/qglobal.h>
-#include <limits.h> // ### Qt 5: remove
 
 QT_BEGIN_HEADER