diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:53:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:53:13 +0200 |
| commit | aa3754d1058c08b18dc5c3f38ca9496ce152c584 (patch) | |
| tree | f2df5de02aab5d82a75e63c54f1bb9882ff89583 /tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp | |
| parent | a12a67c820fb010bc0396233528d652b717842e6 (diff) | |
| parent | 8c81b282f8e18897257b93cb3fc149d74441c40e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iee73c93067c5822d8dd51a8692e6da9df4ba49f5
Diffstat (limited to 'tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp b/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp index d588373034..5a64c5963f 100644 --- a/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp +++ b/tests/auto/corelib/io/qdataurl/tst_qdataurl.cpp @@ -39,8 +39,6 @@ ** ****************************************************************************/ -#define QT_DEPRECATED -#define QT_DISABLE_DEPRECATED_BEFORE 0 #include "private/qdataurl_p.h" #include <QtTest/QtTest> #include <QtCore/QDebug> |