Skip to content

Commit 587bdd1

Browse files
committed
Add QUrl to bootstrap set
The QML language server needs to use QUrl as that is what the language server protocol uses to specify files. As we cannot implicitly cast char to QChar in the bootstrap library, we need to apply a build fix in qipaddress.cpp. Change-Id: Ifaf8421457b1f734402b5aad965ecdec764a73e8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
1 parent 35b25bc commit 587bdd1

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/corelib/io/qipaddress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end
253253

254254
static inline QChar toHex(uchar c)
255255
{
256-
return QtMiscUtils::toHexLower(c);
256+
return QChar::fromLatin1(QtMiscUtils::toHexLower(c));
257257
}
258258

259259
void toString(QString &appendTo, IPv6Address address)

src/tools/bootstrap/bootstrap.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ SOURCES += \
4242
../../corelib/io/qfsfileengine.cpp \
4343
../../corelib/io/qfsfileengine_iterator.cpp \
4444
../../corelib/io/qiodevice.cpp \
45+
../../corelib/io/qipaddress.cpp \
4546
../../corelib/io/qfiledevice.cpp \
4647
../../corelib/io/qresource.cpp \
4748
../../corelib/io/qtemporarydir.cpp \
@@ -50,6 +51,9 @@ SOURCES += \
5051
../../corelib/io/qstandardpaths.cpp \
5152
../../corelib/io/qloggingcategory.cpp \
5253
../../corelib/io/qloggingregistry.cpp \
54+
../../corelib/io/qurl.cpp \
55+
../../corelib/io/qurlidna.cpp \
56+
../../corelib/io/qurlrecode.cpp \
5357
../../corelib/kernel/qcoreapplication.cpp \
5458
../../corelib/kernel/qcoreglobaldata.cpp \
5559
../../corelib/kernel/qmetatype.cpp \

0 commit comments

Comments
 (0)