From e0383c9b8bd6f4e3d445d69690f84209cad42bb5 Mon Sep 17 00:00:00 2001 From: Kjell Rune Skaaraas Date: Mon, 7 Nov 2011 16:18:33 +0100 Subject: Give better error message when using unsupported lookbehinds in QRegExp Merge-request: 1456 Reviewed-by: Oswald Buddenhagen --- src/corelib/tools/qregexp.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index ba1609f..e3a771a 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -66,6 +66,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, #define RXERR_DISABLED QT_TRANSLATE_NOOP("QRegExp", "disabled feature used") #define RXERR_CHARCLASS QT_TRANSLATE_NOOP("QRegExp", "bad char class syntax") #define RXERR_LOOKAHEAD QT_TRANSLATE_NOOP("QRegExp", "bad lookahead syntax") +#define RXERR_LOOKBEHIND QT_TRANSLATE_NOOP("QRegExp", "lookbehinds not supported, see QTBUG-2371") #define RXERR_REPETITION QT_TRANSLATE_NOOP("QRegExp", "bad repetition syntax") #define RXERR_OCTAL QT_TRANSLATE_NOOP("QRegExp", "invalid octal value") #define RXERR_LEFTDELIM QT_TRANSLATE_NOOP("QRegExp", "missing left delim") @@ -3231,6 +3232,9 @@ int QRegExpEngine::getToken() #endif case ':': return Tok_MagicLeftParen; + case '<': + error(RXERR_LOOKBEHIND); + return Tok_MagicLeftParen; default: error(RXERR_LOOKAHEAD); return Tok_MagicLeftParen; -- cgit v0.12 From e1d6df4e5931ee49b4b68dd5a33146f5639268b7 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Fri, 4 Nov 2011 16:56:12 +0100 Subject: SSL: blacklist intermediate certificates that issued weak certs ... as did browser vendors. Tested manually with affected CA certificates. Reviewed-by: Richard J. Moore --- src/network/ssl/qsslcertificate.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 2a2ad55..85cd06c 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -814,6 +814,9 @@ static const char *certificate_blacklist[] = { // "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust + + "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust + "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust 0 }; -- cgit v0.12 From 74884dd3821b22453804cd726e8d10908f493adf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 8 Nov 2011 13:55:21 +0100 Subject: Qt Designer: Fix static linking on Mac. Add a comment in shared.pri explaining the problem. See also e7762b60d519c9ae4b47f6c4ceece584408247ea Reviewed-by: Jarek Kobus Task-number: QTBUG-22542 --- .../src/components/propertyeditor/propertyeditor.pri | 9 +++++++-- tools/designer/src/lib/shared/shared.pri | 12 +++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.pri b/tools/designer/src/components/propertyeditor/propertyeditor.pri index 60219e1..e5e4d46 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor.pri +++ b/tools/designer/src/components/propertyeditor/propertyeditor.pri @@ -4,8 +4,13 @@ INCLUDEPATH += $$PWD -include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) -include(../../../../shared/qtgradienteditor/qtcolorbutton.pri) +contains(CONFIG, static) { # see shared.pri + INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtpropertybrowser + INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtgradienteditor +} else { + include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) + include(../../../../shared/qtgradienteditor/qtcolorbutton.pri) +} FORMS += $$PWD/paletteeditor.ui \ $$PWD/stringlisteditor.ui \ diff --git a/tools/designer/src/lib/shared/shared.pri b/tools/designer/src/lib/shared/shared.pri index 9d50911..b07f565 100644 --- a/tools/designer/src/lib/shared/shared.pri +++ b/tools/designer/src/lib/shared/shared.pri @@ -2,7 +2,17 @@ INCLUDEPATH += $$PWD contains(QT_CONFIG, script): QT += script -include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri) +# When linking dynamically, use only the QKeySequenceEdit widget of +# the property browser solution as the other symbols of the property +# browser solution must not be duplicated (see e7762b60d51). When linking +# statically, add the property browser solution to make the library self-contained +# and use only the include path in the property editor (see propertyeditor.pri) + +contains(CONFIG, static) { + include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) +} else { + include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri) +} include(../../../../shared/deviceskin/deviceskin.pri) include(../../../../../src/tools/rcc/rcc.pri) include(../../../../shared/findwidget/findwidget.pri) -- cgit v0.12