diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-31 17:39:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 12:42:05 +0200 |
| commit | f3d047af903801d9e7705816df5299c4e04a76f4 (patch) | |
| tree | 496e6ce90ef6d60be340f85414ffe640d97322b2 /src/kmap2qmap | |
| parent | 6b2f32f3dc9de965801927a4bc5d970028a318a6 (diff) | |
| download | qttools-f3d047af903801d9e7705816df5299c4e04a76f4.tar.gz | |
Fix Qt6 buildwip/qt6
Fixes some unprefied textstream usages.
Bump the module version to 6.0.0.
Also windeployqt auto test is temporarily blacklisted because
with the current situation it's not possible to make it pass both
with a 5.x and a 6.x Qt build, and thus this would prevent a qt5.git
integration.
Change-Id: If750cf4f50ba4215cb63b53c42971f3d1f1c8160
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/kmap2qmap')
| -rw-r--r-- | src/kmap2qmap/main.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp index 0cff817c5..0f18166bd 100644 --- a/src/kmap2qmap/main.cpp +++ b/src/kmap2qmap/main.cpp @@ -496,27 +496,27 @@ bool KeymapParser::generateHeader(QFile *f) { QTextStream ts(f); - ts << "#ifndef QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H" << endl; - ts << "#define QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H" << endl << endl; + ts << "#ifndef QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H" << Qt::endl; + ts << "#define QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H" << Qt::endl << Qt::endl; - ts << "const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {" << endl; + ts << "const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {" << Qt::endl; for (int i = 0; i < m_keymap.size(); ++i) { const QEvdevKeyboardMap::Mapping &m = m_keymap.at(i); ts << QString::asprintf(" { %3d, 0x%04x, 0x%08x, 0x%02x, 0x%02x, 0x%04x },\n", m.keycode, m.unicode, m.qtcode, m.modifiers, m.flags, m.special); } - ts << "};" << endl << endl; + ts << "};" << Qt::endl << Qt::endl; - ts << "const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] = {" << endl; + ts << "const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] = {" << Qt::endl; for (int i = 0; i < m_keycompose.size(); ++i) { const QEvdevKeyboardMap::Composing &c = m_keycompose.at(i); ts << QString::asprintf(" { 0x%04x, 0x%04x, 0x%04x },\n", c.first, c.second, c.result); } - ts << "};" << endl << endl; + ts << "};" << Qt::endl << Qt::endl; - ts << "#endif" << endl; + ts << "#endif" << Qt::endl; return (ts.status() == QTextStream::Ok); } |