diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-15 09:47:54 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-15 09:47:54 (GMT) |
| commit | fcf91a2d527b393a366c997dd225c076afe34718 (patch) | |
| tree | 0c8027b9f1059a5c63e777838fb4bf45b72293fc /src/network/access | |
| parent | efa48b0a5dba8c8c93612e534d04b5b04629b75c (diff) | |
| parent | 1a867a3c692e375565618532b8ca686dab7e7d5e (diff) | |
| download | Qt-fcf91a2d527b393a366c997dd225c076afe34718.zip Qt-fcf91a2d527b393a366c997dd225c076afe34718.tar.gz Qt-fcf91a2d527b393a366c997dd225c076afe34718.tar.bz2 | |
Merge commit 'origin/4.6'
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 9a72b00..923f2e3 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -49,7 +49,9 @@ #include "QtCore/qdatetime.h" #include <ctype.h> -#include <stdio.h> +#ifndef QT_NO_DATESTRING +# include <stdio.h> +#endif QT_BEGIN_NAMESPACE |