From 82f1cbb3c9e376ac8d3b616d4129832a59176daa Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 22 Apr 2012 00:55:52 +0200 Subject: [PATCH] Build with -DQT_NO_CAST_TO_ASCII. --- CMakeLists.txt | 2 +- tests/TestKeePass2XmlReader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a3070c16..e1cd42993 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ macro(add_gcc_compiler_flags FLAGS) add_gcc_compiler_cflags("${FLAGS}") endmacro(add_gcc_compiler_flags) -add_definitions(-DQT_NO_KEYWORDS -DQT_NO_EXCEPTIONS -DQT_NO_STL -DQT_STRICT_ITERATORS) +add_definitions(-DQT_NO_KEYWORDS -DQT_NO_EXCEPTIONS -DQT_NO_STL -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII) add_gcc_compiler_flags("-ansi -fno-common -fstack-protector -D_FORTIFY_SOURCE=2") add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long") diff --git a/tests/TestKeePass2XmlReader.cpp b/tests/TestKeePass2XmlReader.cpp index b32e45ff1..0e36618cf 100644 --- a/tests/TestKeePass2XmlReader.cpp +++ b/tests/TestKeePass2XmlReader.cpp @@ -32,7 +32,7 @@ namespace QTest { char *toString(const Uuid &uuid) { QByteArray ba = "Uuid("; - ba += uuid.toBase64(); + ba += uuid.toBase64().toAscii().constData(); ba += ")"; return qstrdup(ba.data()); }