diff options
| author | hjk <hjk@qt.io> | 2020-07-09 12:14:40 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-07-12 09:45:23 +0200 |
| commit | 8d8e596719b1af747c8ae428fc6fb6e732c41201 (patch) | |
| tree | f3826522c553c5b42d8e38a4ce15a78d3fb454e5 /src/core5/codecs/qjpunicode.cpp | |
| parent | 6e9fbf5c45dd03330c0017a8e8f48a74ca5a61b8 (diff) | |
Remove the additional Qt5 namespace
The additional Qt5 namespace in Qt5Compat requires projects using
classes from there not only to touch the buildsystem to link to the
module but also the code itself. This hampers migration from Qt5 to Qt6.
Note that adding a plain 'using namespace Qt5;' in some central header is
not sufficient as a work around when using QTextCodec.
Task-number: QTBUG-85504
Change-Id: Id179663b70dd2c5f45e2e09f3dfac53377faa380
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/core5/codecs/qjpunicode.cpp')
| -rw-r--r-- | src/core5/codecs/qjpunicode.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core5/codecs/qjpunicode.cpp b/src/core5/codecs/qjpunicode.cpp index 94f1699..61f6eac 100644 --- a/src/core5/codecs/qjpunicode.cpp +++ b/src/core5/codecs/qjpunicode.cpp @@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE -namespace Qt5 { - #define USE_JISX0212 #define Q_STRICT @@ -10734,6 +10732,4 @@ uint QJpUnicodeConv::unicodeToCp932(uint h, uint l) const \internal */ -} // namespace Qt5 - QT_END_NAMESPACE |