diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 21:03:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-18 21:03:08 (GMT) |
| commit | 730bfd80804899771b39998c5b67e604d2192ecd (patch) | |
| tree | cb4e7f22e4bc4f991da98113c8f98cdea8bd4a23 /src/network/kernel | |
| parent | 6d6b7b318a842ef5037065554f30ebfb4ae34d74 (diff) | |
| parent | 19bf1fec0ec3341fae97e27d3cb0baf8fb27b9f3 (diff) | |
| download | Qt-730bfd80804899771b39998c5b67e604d2192ecd.zip Qt-730bfd80804899771b39998c5b67e604d2192ecd.tar.gz Qt-730bfd80804899771b39998c5b67e604d2192ecd.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 4 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 1 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo_win.cpp | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 28a6c84..8ae1305 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -44,14 +44,10 @@ #include "QtCore/qscopedpointer.h" #include <qabstracteventdispatcher.h> -#include <private/qunicodetables_p.h> #include <qcoreapplication.h> #include <qmetaobject.h> -#include <qregexp.h> -#include <private/qnativesocketengine_p.h> #include <qstringlist.h> #include <qthread.h> -#include <qtimer.h> #include <qurl.h> #ifdef Q_OS_UNIX diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index a186e78..90751f4 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -44,6 +44,7 @@ #include "qplatformdefs.h" #include "qhostinfo_p.h" +#include "private/qnativesocketengine_p.h" #include "qiodevice.h" #include <qbytearray.h> #include <qlibrary.h> diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp index 4264f60..b30204b 100644 --- a/src/network/kernel/qhostinfo_win.cpp +++ b/src/network/kernel/qhostinfo_win.cpp @@ -50,7 +50,6 @@ #include "private/qnativesocketengine_p.h" #include <ws2tcpip.h> #include <qlibrary.h> -#include <qtimer.h> #include <qmutex.h> #include <qurl.h> #include <private/qmutexpool_p.h> |