From 0f1b8fd2dcd2db698095a54ca9beff7e27cf1ceb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 27 Nov 2017 10:40:44 +0100 Subject: work around flex bug flex emits code using isatty(), but fails to include the required unistd.h. we can work around it by including the header ourselves. Task-number: QTBUG-64771 Change-Id: I05313eeb79f7a0e25365dee5f05a0142f87209ae Reviewed-by: Thiago Macieira --- src/tools/qlalr/examples/qparser/calc.l | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/tools') diff --git a/src/tools/qlalr/examples/qparser/calc.l b/src/tools/qlalr/examples/qparser/calc.l index e619e34dab..fe542680a8 100644 --- a/src/tools/qlalr/examples/qparser/calc.l +++ b/src/tools/qlalr/examples/qparser/calc.l @@ -33,6 +33,9 @@ #include "calc_parser.h" #include +// Work around flex bug +#include + #define YY_DECL int CalcParser::nextToken() %} -- cgit v1.2.3 From f0d226e4c5ddace02640e3b41d392e84dcd2ed02 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 22 Sep 2017 00:35:24 -0700 Subject: Add a "shim" to allow use of Clang 5's __builtin_available everywhere This is mostly relevant for Apple platforms, where we can use the new unguarded availability warnings to guarantee that proper version checks are present when using APIs that are not necessarily available on the deployment target. Change-Id: Ie408704b2924e1220491a9ea30f0141dfa4867d9 Reviewed-by: Thiago Macieira (cherry-picked from 70422449ef892d7cc3086d88e5e9e43c771e2bc3) --- src/tools/bootstrap/bootstrap.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tools') diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 521dd5f0f2..50f669cd23 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -80,6 +80,7 @@ SOURCES += \ ../../corelib/tools/qstringbuilder.cpp \ ../../corelib/tools/qstring_compat.cpp \ ../../corelib/tools/qstringlist.cpp \ + ../../corelib/tools/qversionnumber.cpp \ ../../corelib/tools/qvsnprintf.cpp \ ../../corelib/xml/qxmlutils.cpp \ ../../corelib/xml/qxmlstream.cpp \ -- cgit v1.2.3 From 44da5b863597e761df3545dc7ff02a9b53bbb13d Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 27 Dec 2017 12:42:26 -0800 Subject: Allow moc to handle Unicode output filenames on Windows with MSVC The C standard library functions cannot handle UTF-8 filenames. Instead, we need to use the wide-character versions which accept UTF-16 input. Task-number: QTBUG-65492 Change-Id: If4b3b4eeeec4f3bbb428b8f6b0311a65d01463b0 Reviewed-by: Thiago Macieira --- src/tools/moc/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools') diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 98cc9652ab..dfcc23f0d6 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -486,8 +486,8 @@ int runMoc(int argc, char **argv) // 3. and output meta object code if (output.size()) { // output file specified -#if defined(_MSC_VER) && _MSC_VER >= 1400 - if (fopen_s(&out, QFile::encodeName(output).constData(), "w")) +#if defined(_MSC_VER) + if (_wfopen_s(&out, reinterpret_cast(output.utf16()), L"w") != 0) #else out = fopen(QFile::encodeName(output).constData(), "w"); // create output file if (!out) -- cgit v1.2.3