diff options
Diffstat (limited to 'tests')
4 files changed, 20 insertions, 2 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp index dec5232fc..9e0136258 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp @@ -139,3 +139,10 @@ const QString nodelimiter(QObject::tr(R"( const Qstring withdelimiter = QObject::tr(R"delim( This is a test string )delim"); + + +// New in C++14: integer literals may contain single quotes as separator. +struct IntLiteralsWithSeparators { + long d = 10'000'000'0'00; + int x = 0x1'AF'FE; +}; diff --git a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf index e4cef822e..3844c2acf 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf +++ b/tests/auto/qdoc/generatedoutput/testdata/configs/test.qdocconf @@ -7,6 +7,6 @@ sources = ../outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc macro.beginqdoc = "\\c {/*!}" macro.endqdoc = "\\c */" -# zero warning tolerance -warninglimit = 0 +# allow (qdoc) warning: Can't link to '' +warninglimit = 1 warninglimit.enabled = true diff --git a/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc b/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc index e56c447c4..b0f4f16d6 100644 --- a/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc +++ b/tests/auto/qdoc/generatedoutput/testdata/outputfromqdocfiles/qdoctests-outputfromqdocfiles.qdoc @@ -81,3 +81,10 @@ titles, targets defined with \\target or \\keyword commands, and API reference keywords (types, methods, namespaces, and so on). */ + +// Empty link target that was known to assert +/*! + \page crash.html + + \l {} +*/ diff --git a/tests/auto/qdoc/qdoc.pro b/tests/auto/qdoc/qdoc.pro index c7af516ae..481e59d1d 100644 --- a/tests/auto/qdoc/qdoc.pro +++ b/tests/auto/qdoc/qdoc.pro @@ -1,5 +1,9 @@ TEMPLATE = subdirs +include($$OUT_PWD/../../../src/qdoc/qtqdoc-config.pri) +QT_FOR_CONFIG += qdoc-private +requires(qtConfig(qdoc)) + SUBDIRS = \ config \ generatedoutput \ |