diff options
author | David Schulz <david.schulz@theqtcompany.com> | 2016-04-20 09:33:21 +0200 |
---|---|---|
committer | David Schulz <david.schulz@theqtcompany.com> | 2016-04-22 07:37:31 +0000 |
commit | cc04b84917ef0f90e2017bf652b7327ce5edda9c (patch) | |
tree | fe374cd50bb8e9f18c4b747f97a0712e41124d16 /tests/manual | |
parent | 89c2b2cd327a1f929924265622c80e22719998d4 (diff) | |
download | qt-creator-cc04b84917ef0f90e2017bf652b7327ce5edda9c.tar.gz |
Fix compiler warnings on windows.
Ignore some warnings inside 3rd party code and fix a lot of conversion
warnings.
Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/debugger/simple/simple_test_app.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index a1902e89e4..20190cc264 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -236,6 +236,7 @@ void dummyStatement(...) {} #ifdef Q_OS_WIN #include <windows.h> +#include <basetsd.h> #undef min #undef max #endif @@ -276,7 +277,11 @@ void dummyStatement(...) {} QT_BEGIN_NAMESPACE uint qHash(const QMap<int, int> &) { return 0; } uint qHash(const double & f) { return int(f); } -uint qHash(const QPointer<QObject> &p) { return (ulong)p.data(); } +#ifdef Q_OS_WIN +uint qHash(const QPointer<QObject> &p) { return PtrToUint(p.data()); } +#else +uint qHash(const QPointer<QObject> &p) { (ulong)p.data(); } +#endif QT_END_NAMESPACE @@ -3336,7 +3341,7 @@ namespace lambda { { std::string x; auto f = [&] () -> const std::string & { - int z = x.size(); + size_t z = x.size(); Q_UNUSED(z); return x; }; |