diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-20 13:19:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-20 21:59:28 +0200 |
| commit | 60818231d82ca34f1d33ccb9ba7500b5470a3d0d (patch) | |
| tree | 4f0c2c00aaae3a646eb23217eae8efd30480ec4d | |
| parent | 373845dfd8acae0c941432c8cd615b77bcae0a2a (diff) | |
tst_qurlinternal: use qurl_p.h instead of declaring the functions
Just in case someone (like me) changes the function signatures or adds
new functions.
Change-Id: I1025fea012d95ffe89acaf799aa58fd2b0babc80
Reviewed-by: David Faure <faure@kde.org>
| -rw-r--r-- | src/corelib/io/qurl_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/io/qurl_p.h b/src/corelib/io/qurl_p.h index a1efb29ff8..e55ba4a52a 100644 --- a/src/corelib/io/qurl_p.h +++ b/src/corelib/io/qurl_p.h @@ -173,7 +173,7 @@ public: // in qurlrecode.cpp extern Q_AUTOTEST_EXPORT int qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end, - QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications); + QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications = 0); // in qurlidna.cpp enum AceOperation { ToAceOnly, NormalizeAce }; diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp index 67e43028d4..e008133d87 100644 --- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp +++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp @@ -44,15 +44,7 @@ #include <QtTest/QtTest> #include "private/qtldurl_p.h" - -QT_BEGIN_NAMESPACE -Q_CORE_EXPORT extern void qt_nameprep(QString *source, int from); -Q_CORE_EXPORT extern bool qt_check_std3rules(const QChar *, int); -Q_CORE_EXPORT void qt_punycodeEncoder(const QChar *s, int ucLength, QString *output); -Q_CORE_EXPORT QString qt_punycodeDecoder(const QString &pc); -Q_CORE_EXPORT int qt_urlRecode(QString &appendTo, const QChar *input, const QChar *end, - QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications = 0); -QT_END_NAMESPACE +#include "private/qurl_p.h" // For testsuites #define IDNA_ACE_PREFIX "xn--" |