From ace1f8cdec2edf8a7d7e5309900da71dce85e74b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 9 Jun 2013 22:15:20 -0500 Subject: [PATCH] 4.8.5-RC --- .gitignore | 2 +- ...mpatibility-between-openssl-versions.patch | 80 --------- ...mberingSystem-value-for-some-indic-a.patch | 153 ------------------ ...ger-argument-and-value-to-be-separat.patch | 43 ----- ...-blacklist-mis-issued-Turktrust-cert.patch | 107 ------------ ...work-blacklist-two-more-certificates.patch | 39 ----- ...serInput-fix-for-urls-without-a-host.patch | 38 ----- ...of-the-QUrlPrivate-port-to-1-to-6553.patch | 37 ----- ...collect-deleted-objects-now-and-then.patch | 53 ------ ...-shortcuts-with-secondary-Xkb-layout.patch | 34 ---- ...ion-by-CTRL-click-in-QFileDialog-KDE.patch | 35 ---- qt-4.8-CVE-2013-0254.patch | 147 ----------------- qt-4.8.0-CVE-2011-3922-bz#772125.patch | 12 -- ...ere-opensource-src-4.7.1-QTBUG-14467.patch | 27 ---- ...rce-src-4.7.4-tds_no_strict_aliasing.patch | 12 -- ...where-opensource-src-4.8.0-timestamp.patch | 75 --------- ...ere-opensource-src-4.8.4-QTBUG-22829.patch | 15 -- ...ere-opensource-src-4.8.4-QTBUG-29082.patch | 31 ---- ....4-qgtkstyle_disable_gtk_theme_check.patch | 26 --- ...ere-opensource-src-4.8.5-QTBUG-14467.patch | 24 +++ ...ere-opensource-src-4.8.5-QTBUG-21900.patch | 31 +--- ...ere-opensource-src-4.8.5-QTBUG-22829.patch | 14 ++ ...here-opensource-src-4.8.5-QTBUG-4862.patch | 13 +- ....5-qgtkstyle_disable_gtk_theme_check.patch | 22 +++ ...rce-src-4.8.5-tds_no_strict_aliasing.patch | 12 ++ ...re-opensource-src-4.8.5-uic_multilib.patch | 28 ++++ qt.spec | 73 +++------ sources | 4 +- 28 files changed, 138 insertions(+), 1049 deletions(-) delete mode 100644 0054-Fix-binary-incompatibility-between-openssl-versions.patch delete mode 100644 0057-Update-defaultNumberingSystem-value-for-some-indic-a.patch delete mode 100644 0067-Allow-qmljsdebugger-argument-and-value-to-be-separat.patch delete mode 100644 0080-SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch delete mode 100644 0090-QtNetwork-blacklist-two-more-certificates.patch delete mode 100644 0110-QUrl-fromUserInput-fix-for-urls-without-a-host.patch delete mode 100644 0112-Limit-the-range-of-the-QUrlPrivate-port-to-1-to-6553.patch delete mode 100644 0124-QtDBus-Garbage-collect-deleted-objects-now-and-then.patch delete mode 100644 0125-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch delete mode 100644 0214-Fix-multiselection-by-CTRL-click-in-QFileDialog-KDE.patch delete mode 100644 qt-4.8-CVE-2013-0254.patch delete mode 100644 qt-4.8.0-CVE-2011-3922-bz#772125.patch delete mode 100644 qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch delete mode 100644 qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch delete mode 100644 qt-everywhere-opensource-src-4.8.0-timestamp.patch delete mode 100644 qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch delete mode 100644 qt-everywhere-opensource-src-4.8.4-QTBUG-29082.patch delete mode 100644 qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch create mode 100644 qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch rename qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch => qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch (72%) create mode 100644 qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch rename qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch => qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch (57%) create mode 100644 qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch create mode 100644 qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch create mode 100644 qt-everywhere-opensource-src-4.8.5-uic_multilib.patch diff --git a/.gitignore b/.gitignore index c5ac644..4ed48e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /hi128-app-qt4-logo.png /hi48-app-qt4-logo.png -/qt-everywhere-opensource-src-4.8.3.tar.gz /qt-everywhere-opensource-src-4.8.4.tar.gz +/qt-everywhere-opensource-src-4.8.5-RC.tar.gz diff --git a/0054-Fix-binary-incompatibility-between-openssl-versions.patch b/0054-Fix-binary-incompatibility-between-openssl-versions.patch deleted file mode 100644 index 5f56edd..0000000 --- a/0054-Fix-binary-incompatibility-between-openssl-versions.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 691e78e5061d4cbc0de212d23b06c5dffddf2098 Mon Sep 17 00:00:00 2001 -From: Shane Kearns -Date: Thu, 6 Dec 2012 17:03:18 +0000 -Subject: [PATCH 54/79] Fix binary incompatibility between openssl versions - -OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 -So we have to consider this struct as private implementation, and use -the access functions instead. - -This bug would cause certificate verification problems if a different -version of openssl is loaded at runtime to the headers Qt was compiled -against. - -Task-number: QTBUG-28343 -Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 -Reviewed-by: Richard J. Moore -(cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252) ---- - src/network/ssl/qsslsocket_openssl.cpp | 2 +- - src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++ - src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 ++++ - 3 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp -index b7ca290..e912abac 100644 ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -236,7 +236,7 @@ static int q_X509Callback(int ok, X509_STORE_CTX *ctx) - { - if (!ok) { - // Store the error and at which depth the error was detected. -- _q_sslErrorList()->errors << qMakePair(ctx->error, ctx->error_depth); -+ _q_sslErrorList()->errors << qMakePair(q_X509_STORE_CTX_get_error(ctx), q_X509_STORE_CTX_get_error_depth(ctx)); - } - // Always return OK to allow verification to continue. We're handle the - // errors gracefully after collecting all errors, after verification has -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 2d6a25b..2e6ccd0 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -267,6 +267,10 @@ DEFINEFUNC2(int, X509_STORE_add_cert, X509_STORE *a, a, X509 *b, b, return 0, re - DEFINEFUNC(void, X509_STORE_CTX_free, X509_STORE_CTX *a, a, return, DUMMYARG) - DEFINEFUNC4(int, X509_STORE_CTX_init, X509_STORE_CTX *a, a, X509_STORE *b, b, X509 *c, c, STACK_OF(X509) *d, d, return -1, return) - DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, return -1, return) -+DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) -+DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) -+DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) -+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) - DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) - #ifdef SSLEAY_MACROS - DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) -@@ -832,6 +836,10 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(X509_STORE_CTX_init) - RESOLVEFUNC(X509_STORE_CTX_new) - RESOLVEFUNC(X509_STORE_CTX_set_purpose) -+ RESOLVEFUNC(X509_STORE_CTX_get_error) -+ RESOLVEFUNC(X509_STORE_CTX_get_error_depth) -+ RESOLVEFUNC(X509_STORE_CTX_get_current_cert) -+ RESOLVEFUNC(X509_STORE_CTX_get_chain) - RESOLVEFUNC(X509_cmp) - #ifndef SSLEAY_MACROS - RESOLVEFUNC(X509_dup) -diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h -index fa9a157..87f3697 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h -+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -374,6 +374,10 @@ int q_X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, - X509 *x509, STACK_OF(X509) *chain); - X509_STORE_CTX *q_X509_STORE_CTX_new(); - int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); -+int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); -+int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); -+X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); -+STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); - - #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) - #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) --- -1.8.0.2 - diff --git a/0057-Update-defaultNumberingSystem-value-for-some-indic-a.patch b/0057-Update-defaultNumberingSystem-value-for-some-indic-a.patch deleted file mode 100644 index 32651e8..0000000 --- a/0057-Update-defaultNumberingSystem-value-for-some-indic-a.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 94a5839d74d53832674cd6eca49c980bac27fc04 Mon Sep 17 00:00:00 2001 -From: mfekari -Date: Mon, 10 Dec 2012 08:51:36 -0500 -Subject: [PATCH 057/246] Update defaultNumberingSystem value for some indic - and slovak countries/regions - -Qt gets the information about locale digits from the -entries in the CLDR data xm files. Current CLDR data in Qt4.8 is 2.0, which -specifies native digits for most of Indic locales and arabic digits for slovak locale. - -This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which specify Latin digits for the locales in question. - -This patch updates the defaultNumberingSystem (to latin) and provides an autotest to compare the returned vs expected digits for the following langagues/regions: - -- Gujarati, Hindi, Kannada, Konkani, Malayalam, Marathi, Nepali, Punjabi, Tamil, Telugu (to use latin digits instead of native ones) -- Slovak (to use latin digits instead of arabic ones) - -Change-Id: I04364cdb80292f7705b1321377623298a01a9c5b -Reviewed-by: Vladimir Minenko -Reviewed-by: Konstantin Ritt ---- - src/corelib/tools/qlocale_data_p.h | 38 ++++++++++++++++++------------------ - tests/auto/qlocale/tst_qlocale.cpp | 40 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+), 19 deletions(-) - -diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h -index 6c848d0..07ebd36 100644 ---- a/src/corelib/tools/qlocale_data_p.h -+++ b/src/corelib/tools/qlocale_data_p.h -@@ -75,7 +75,7 @@ static const int ImperialMeasurementSystemsCount = - // GENERATED PART STARTS HERE - - /* -- This part of the file was generated on 2012-11-02 from the -+ This part of the file was generated on 2012-12-11 from the - Common Locale Data Repository v2.0 - - http://www.unicode.org/cldr/ -@@ -464,7 +464,7 @@ static const QLocalePrivate locale_data[] = { - { 43, 0, 85, 44, 46, 44, 37, 48, 45, 43, 101, 171, 187, 8216, 8217, 0,6 , 0,6 , 178,9 , 178,9 , 279,6 , 10,17 , 18,7 , 25,12 , 5361,50 , 5411,115 , 5526,24 , 5430,50 , 5480,115 , 5595,24 , 3402,28 , 3430,55 , 3485,14 , 3499,28 , 3430,55 , 3485,14 , 112,4 , 102,4 , {69,85,82}, 112,1 , 3747,19 , 25,5 , 4,0 , 1544,8 , 1552,6 , 2, 1, 1, 6, 7 }, // Greek/AnyScript/Greece - { 43, 0, 56, 44, 46, 44, 37, 48, 45, 43, 101, 171, 187, 8216, 8217, 0,6 , 0,6 , 178,9 , 178,9 , 279,6 , 10,17 , 18,7 , 25,12 , 5361,50 , 5411,115 , 5526,24 , 5430,50 , 5480,115 , 5595,24 , 3402,28 , 3430,55 , 3485,14 , 3499,28 , 3430,55 , 3485,14 , 112,4 , 102,4 , {69,85,82}, 112,1 , 3747,19 , 4,4 , 4,0 , 1544,8 , 1558,6 , 2, 1, 1, 6, 7 }, // Greek/AnyScript/Cyprus - { 44, 0, 86, 44, 46, 59, 37, 48, 8722, 43, 101, 187, 171, 8250, 8249, 187,11 , 0,6 , 0,6 , 187,11 , 72,10 , 82,17 , 18,7 , 25,12 , 3581,48 , 5550,96 , 134,24 , 5619,48 , 5667,96 , 320,24 , 3527,28 , 3555,98 , 3653,14 , 3527,28 , 3555,98 , 3653,14 , 0,2 , 0,2 , {68,75,75}, 131,2 , 3766,24 , 4,4 , 36,5 , 1564,11 , 1575,16 , 2, 1, 1, 6, 7 }, // Greenlandic/AnyScript/Greenland -- { 46, 0, 100, 1643, 1644, 1563, 1642, 2790, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 198,9 , 198,9 , 609,7 , 203,18 , 345,8 , 353,13 , 5646,67 , 5713,87 , 5800,31 , 5763,67 , 5830,87 , 5917,31 , 3667,32 , 3699,53 , 3752,19 , 3667,32 , 3699,53 , 3752,19 , 116,14 , 106,14 , {73,78,82}, 166,2 , 3790,20 , 8,5 , 4,0 , 1591,7 , 1598,4 , 2, 1, 7, 7, 7 }, // Gujarati/AnyScript/India -+ { 46, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 198,9 , 198,9 , 609,7 , 203,18 , 345,8 , 353,13 , 5646,67 , 5713,87 , 5800,31 , 5763,67 , 5830,87 , 5917,31 , 3667,32 , 3699,53 , 3752,19 , 3667,32 , 3699,53 , 3752,19 , 116,14 , 106,14 , {73,78,82}, 166,2 , 3790,20 , 8,5 , 4,0 , 1591,7 , 1598,4 , 2, 1, 7, 7, 7 }, // Gujarati/AnyScript/India - { 47, 0, 83, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 8220, 8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5831,48 , 5879,85 , 5964,24 , 5948,48 , 5996,85 , 6081,24 , 3771,21 , 3792,52 , 3844,14 , 3771,21 , 3792,52 , 3844,14 , 0,2 , 0,2 , {71,72,83}, 0,0 , 0,7 , 8,5 , 4,0 , 1602,5 , 1607,4 , 2, 1, 1, 6, 7 }, // Hausa/AnyScript/Ghana - { 47, 0, 156, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 8220, 8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5831,48 , 5879,85 , 5964,24 , 5948,48 , 5996,85 , 6081,24 , 3771,21 , 3792,52 , 3844,14 , 3771,21 , 3792,52 , 3844,14 , 0,2 , 0,2 , {88,79,70}, 168,3 , 3810,36 , 8,5 , 4,0 , 1602,5 , 1611,5 , 0, 0, 1, 6, 7 }, // Hausa/AnyScript/Niger - { 47, 0, 157, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 8220, 8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5831,48 , 5879,85 , 5964,24 , 5948,48 , 5996,85 , 6081,24 , 3771,21 , 3792,52 , 3844,14 , 3771,21 , 3792,52 , 3844,14 , 0,2 , 0,2 , {78,71,78}, 171,1 , 3846,12 , 8,5 , 4,0 , 1602,5 , 1616,8 , 2, 1, 1, 6, 7 }, // Hausa/AnyScript/Nigeria -@@ -472,7 +472,7 @@ static const QLocalePrivate locale_data[] = { - { 47, 7, 156, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 8220, 8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5831,48 , 5879,85 , 5964,24 , 5948,48 , 5996,85 , 6081,24 , 3771,21 , 3792,52 , 3844,14 , 3771,21 , 3792,52 , 3844,14 , 0,2 , 0,2 , {88,79,70}, 168,3 , 3810,36 , 8,5 , 4,0 , 1602,5 , 1611,5 , 0, 0, 1, 6, 7 }, // Hausa/Latin/Niger - { 47, 7, 157, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 8220, 8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5831,48 , 5879,85 , 5964,24 , 5948,48 , 5996,85 , 6081,24 , 3771,21 , 3792,52 , 3844,14 , 3771,21 , 3792,52 , 3844,14 , 0,2 , 0,2 , {78,71,78}, 171,1 , 3846,12 , 8,5 , 4,0 , 1602,5 , 1616,8 , 2, 1, 1, 6, 7 }, // Hausa/Latin/Nigeria - { 48, 0, 105, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 34, 34, 0,6 , 0,6 , 207,7 , 207,7 , 27,8 , 616,18 , 37,5 , 8,10 , 5988,58 , 6046,72 , 1381,27 , 6105,48 , 6153,72 , 134,27 , 3858,46 , 3904,65 , 3969,14 , 3858,46 , 3904,65 , 3969,14 , 130,6 , 120,5 , {73,76,83}, 172,1 , 3858,21 , 25,5 , 4,0 , 1624,5 , 1629,5 , 2, 1, 7, 5, 6 }, // Hebrew/AnyScript/Israel -- { 49, 0, 100, 46, 44, 59, 37, 2406, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 214,9 , 223,8 , 634,6 , 10,17 , 18,7 , 25,12 , 6118,75 , 6118,75 , 6193,30 , 6225,75 , 6225,75 , 6300,30 , 3983,38 , 4021,57 , 4078,19 , 3983,38 , 4021,57 , 4078,19 , 136,9 , 125,7 , {73,78,82}, 173,3 , 3879,19 , 8,5 , 4,0 , 1634,6 , 1640,4 , 2, 1, 7, 7, 7 }, // Hindi/AnyScript/India -+ { 49, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 214,9 , 223,8 , 634,6 , 10,17 , 18,7 , 25,12 , 6118,75 , 6118,75 , 6193,30 , 6225,75 , 6225,75 , 6300,30 , 3983,38 , 4021,57 , 4078,19 , 3983,38 , 4021,57 , 4078,19 , 136,9 , 125,7 , {73,78,82}, 173,3 , 3879,19 , 8,5 , 4,0 , 1634,6 , 1640,4 , 2, 1, 7, 7, 7 }, // Hindi/AnyScript/India - { 50, 0, 98, 44, 160, 59, 37, 48, 45, 43, 101, 8222, 8221, 8222, 8221, 0,6 , 0,6 , 231,8 , 231,8 , 640,11 , 651,19 , 165,4 , 195,9 , 6223,64 , 6287,98 , 6385,25 , 6330,64 , 6394,98 , 6492,25 , 4097,19 , 4116,52 , 4168,17 , 4097,19 , 4116,52 , 4168,17 , 145,3 , 132,3 , {72,85,70}, 176,2 , 3898,20 , 25,5 , 4,0 , 1644,6 , 1650,12 , 0, 0, 1, 6, 7 }, // Hungarian/AnyScript/Hungary - { 51, 0, 99, 44, 46, 59, 37, 48, 8722, 43, 101, 8222, 8220, 8218, 8216, 0,6 , 0,6 , 111,8 , 111,8 , 582,8 , 498,18 , 37,5 , 8,10 , 6410,48 , 6458,82 , 6540,24 , 6517,48 , 6565,82 , 6647,24 , 4185,28 , 4213,81 , 4294,14 , 4185,28 , 4213,81 , 4308,14 , 148,4 , 135,4 , {73,83,75}, 131,2 , 3918,48 , 25,5 , 4,0 , 1662,8 , 1670,6 , 0, 0, 1, 6, 7 }, // Icelandic/AnyScript/Iceland - { 52, 0, 101, 44, 46, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 239,10 , 249,9 , 27,8 , 123,18 , 37,5 , 195,9 , 6564,48 , 6612,87 , 134,24 , 6671,48 , 6719,87 , 320,24 , 4322,28 , 4350,43 , 4393,14 , 4322,28 , 4350,43 , 4393,14 , 152,4 , 139,5 , {73,68,82}, 178,2 , 3966,23 , 4,4 , 4,0 , 1676,16 , 1692,9 , 0, 0, 7, 6, 7 }, // Indonesian/AnyScript/Indonesia -@@ -480,7 +480,7 @@ static const QLocalePrivate locale_data[] = { - { 58, 0, 106, 44, 46, 59, 37, 48, 45, 43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 258,8 , 154,7 , 27,8 , 99,16 , 37,5 , 8,10 , 6732,48 , 6780,94 , 6874,24 , 6839,48 , 6887,94 , 6981,24 , 4439,28 , 4467,57 , 4524,14 , 4439,28 , 4538,57 , 4524,14 , 156,2 , 144,2 , {69,85,82}, 112,1 , 1825,19 , 8,5 , 4,0 , 1712,8 , 1720,6 , 2, 1, 1, 6, 7 }, // Italian/AnyScript/Italy - { 58, 0, 206, 46, 39, 59, 37, 48, 45, 43, 101, 171, 187, 8249, 8250, 0,6 , 0,6 , 258,8 , 154,7 , 332,8 , 10,17 , 37,5 , 331,14 , 6732,48 , 6780,94 , 6874,24 , 6839,48 , 6887,94 , 6981,24 , 4439,28 , 4467,57 , 4524,14 , 4439,28 , 4538,57 , 4524,14 , 156,2 , 144,2 , {67,72,70}, 163,3 , 3989,53 , 8,5 , 48,5 , 1712,8 , 1726,8 , 2, 5, 1, 6, 7 }, // Italian/AnyScript/Switzerland - { 59, 0, 108, 46, 44, 59, 37, 48, 45, 43, 101, 12300, 12301, 12302, 12303, 94,5 , 94,5 , 94,5 , 94,5 , 221,8 , 429,13 , 165,4 , 366,10 , 3254,39 , 3254,39 , 1381,27 , 3278,39 , 3278,39 , 134,27 , 4595,14 , 4609,28 , 4595,14 , 4595,14 , 4609,28 , 4595,14 , 158,2 , 146,2 , {74,80,89}, 123,1 , 4042,10 , 4,4 , 4,0 , 1734,3 , 1737,2 , 0, 0, 7, 6, 7 }, // Japanese/AnyScript/Japan -- { 61, 0, 100, 1643, 1644, 1563, 1642, 3302, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 266,12 , 278,11 , 634,6 , 99,16 , 345,8 , 353,13 , 6898,86 , 6898,86 , 6984,31 , 7005,86 , 7005,86 , 7091,31 , 4637,28 , 4665,53 , 4718,19 , 4637,28 , 4665,53 , 4718,19 , 0,2 , 0,2 , {73,78,82}, 114,1 , 4052,20 , 8,5 , 4,0 , 1739,5 , 1744,4 , 2, 1, 7, 7, 7 }, // Kannada/AnyScript/India -+ { 61, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 266,12 , 278,11 , 634,6 , 99,16 , 345,8 , 353,13 , 6898,86 , 6898,86 , 6984,31 , 7005,86 , 7005,86 , 7091,31 , 4637,28 , 4665,53 , 4718,19 , 4637,28 , 4665,53 , 4718,19 , 0,2 , 0,2 , {73,78,82}, 114,1 , 4052,20 , 8,5 , 4,0 , 1739,5 , 1744,4 , 2, 1, 7, 7, 7 }, // Kannada/AnyScript/India - { 63, 0, 110, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 332,8 , 670,22 , 37,5 , 8,10 , 7015,61 , 7076,83 , 1381,27 , 7122,61 , 7183,83 , 134,27 , 4737,28 , 4765,56 , 708,14 , 4821,28 , 4849,54 , 708,14 , 0,2 , 0,2 , {75,90,84}, 180,4 , 4072,24 , 25,5 , 4,0 , 1748,10 , 1758,9 , 2, 1, 1, 6, 7 }, // Kazakh/AnyScript/Kazakhstan - { 63, 2, 110, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 332,8 , 670,22 , 37,5 , 8,10 , 7015,61 , 7076,83 , 1381,27 , 7122,61 , 7183,83 , 134,27 , 4737,28 , 4765,56 , 708,14 , 4821,28 , 4849,54 , 708,14 , 0,2 , 0,2 , {75,90,84}, 180,4 , 4072,24 , 25,5 , 4,0 , 1748,10 , 1758,9 , 2, 1, 1, 6, 7 }, // Kazakh/Cyrillic/Kazakhstan - { 64, 0, 179, 44, 46, 59, 37, 48, 45, 43, 101, 8216, 8217, 171, 187, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 7159,60 , 7219,101 , 1381,27 , 7266,60 , 7326,101 , 134,27 , 4903,35 , 4938,84 , 708,14 , 4903,35 , 4938,84 , 708,14 , 0,2 , 0,2 , {82,87,70}, 184,2 , 0,7 , 8,5 , 4,0 , 1767,11 , 1340,6 , 0, 0, 1, 6, 7 }, // Kinyarwanda/AnyScript/Rwanda -@@ -488,8 +488,8 @@ static const QLocalePrivate locale_data[] = { - { 66, 0, 114, 46, 44, 59, 37, 48, 45, 43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 289,7 , 289,7 , 692,9 , 701,16 , 376,7 , 383,13 , 7320,39 , 7320,39 , 7320,39 , 7427,39 , 7427,39 , 7427,39 , 5022,14 , 5036,28 , 5022,14 , 5022,14 , 5036,28 , 5022,14 , 160,2 , 148,2 , {75,82,87}, 189,1 , 4096,13 , 4,4 , 4,0 , 1794,3 , 1797,4 , 0, 0, 7, 6, 7 }, // Korean/AnyScript/RepublicOfKorea - { 67, 0, 102, 1643, 1644, 1563, 1642, 1632, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7359,105 , 7359,105 , 7464,26 , 7466,105 , 7466,105 , 7571,26 , 5064,58 , 5064,58 , 5122,14 , 5064,58 , 5064,58 , 5122,14 , 0,2 , 0,2 , {73,82,82}, 0,0 , 4109,19 , 8,5 , 4,0 , 1801,5 , 1806,5 , 0, 0, 6, 4, 5 }, // Kurdish/AnyScript/Iran - { 67, 0, 103, 1643, 1644, 1563, 1642, 1632, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7359,105 , 7359,105 , 7464,26 , 7466,105 , 7466,105 , 7571,26 , 5064,58 , 5064,58 , 5122,14 , 5064,58 , 5064,58 , 5122,14 , 0,2 , 0,2 , {73,81,68}, 0,0 , 4128,20 , 8,5 , 4,0 , 1801,5 , 1811,5 , 0, 0, 6, 5, 6 }, // Kurdish/AnyScript/Iraq -- { 67, 0, 207, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7490,41 , 7531,51 , 7582,27 , 7597,41 , 7638,51 , 7689,27 , 5136,20 , 5156,39 , 5195,14 , 5136,20 , 5156,39 , 5195,14 , 0,2 , 0,2 , {83,89,80}, 0,0 , 0,7 , 8,5 , 4,0 , 1816,5 , 0,0 , 0, 0, 6, 5, 6 }, // Kurdish/AnyScript/SyrianArabRepublic -- { 67, 0, 217, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7490,41 , 7531,51 , 7582,27 , 7597,41 , 7638,51 , 7689,27 , 5136,20 , 5156,39 , 5195,14 , 5136,20 , 5156,39 , 5195,14 , 0,2 , 0,2 , {84,82,89}, 190,2 , 0,7 , 8,5 , 4,0 , 1816,5 , 1821,7 , 2, 1, 1, 6, 7 }, // Kurdish/AnyScript/Turkey -+ { 67, 0, 207, 1643, 1644, 1563, 1642, 1632, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7490,41 , 7531,51 , 7582,27 , 7597,41 , 7638,51 , 7689,27 , 5136,20 , 5156,39 , 5195,14 , 5136,20 , 5156,39 , 5195,14 , 0,2 , 0,2 , {83,89,80}, 0,0 , 0,7 , 8,5 , 4,0 , 1816,5 , 0,0 , 0, 0, 6, 5, 6 }, // Kurdish/AnyScript/SyrianArabRepublic -+ { 67, 0, 217, 1643, 1644, 1563, 1642, 1632, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7490,41 , 7531,51 , 7582,27 , 7597,41 , 7638,51 , 7689,27 , 5136,20 , 5156,39 , 5195,14 , 5136,20 , 5156,39 , 5195,14 , 0,2 , 0,2 , {84,82,89}, 190,2 , 0,7 , 8,5 , 4,0 , 1816,5 , 1821,7 , 2, 1, 1, 6, 7 }, // Kurdish/AnyScript/Turkey - { 67, 1, 102, 1643, 1644, 1563, 1642, 1632, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7359,105 , 7359,105 , 7464,26 , 7466,105 , 7466,105 , 7571,26 , 5064,58 , 5064,58 , 5122,14 , 5064,58 , 5064,58 , 5122,14 , 0,2 , 0,2 , {73,82,82}, 0,0 , 4109,19 , 8,5 , 4,0 , 1801,5 , 1806,5 , 0, 0, 6, 4, 5 }, // Kurdish/Arabic/Iran - { 67, 1, 103, 1643, 1644, 1563, 1642, 1632, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7359,105 , 7359,105 , 7464,26 , 7466,105 , 7466,105 , 7571,26 , 5064,58 , 5064,58 , 5122,14 , 5064,58 , 5064,58 , 5122,14 , 0,2 , 0,2 , {73,81,68}, 0,0 , 4128,20 , 8,5 , 4,0 , 1801,5 , 1811,5 , 0, 0, 6, 5, 6 }, // Kurdish/Arabic/Iraq - { 67, 7, 207, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7490,41 , 7531,51 , 7582,27 , 7597,41 , 7638,51 , 7689,27 , 5136,20 , 5156,39 , 5195,14 , 5136,20 , 5156,39 , 5195,14 , 0,2 , 0,2 , {83,89,80}, 0,0 , 0,7 , 8,5 , 4,0 , 1816,5 , 0,0 , 0, 0, 6, 5, 6 }, // Kurdish/Latin/SyrianArabRepublic -@@ -504,15 +504,15 @@ static const QLocalePrivate locale_data[] = { - { 75, 0, 128, 46, 44, 59, 37, 48, 45, 43, 101, 171, 187, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 8715,48 , 8763,92 , 134,24 , 8821,48 , 8869,92 , 320,24 , 5874,34 , 5908,60 , 5968,14 , 5874,34 , 5908,60 , 5968,14 , 0,2 , 0,2 , {77,71,65}, 0,0 , 4366,13 , 4,4 , 4,0 , 1938,8 , 1946,12 , 0, 0, 1, 6, 7 }, // Malagasy/AnyScript/Madagascar - { 76, 0, 130, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 239,10 , 249,9 , 547,7 , 10,17 , 18,7 , 25,12 , 8855,49 , 8904,82 , 8986,24 , 8961,49 , 9010,82 , 9092,24 , 5982,28 , 6010,43 , 6053,14 , 5982,28 , 6010,43 , 6053,14 , 208,2 , 186,3 , {77,89,82}, 201,2 , 4379,23 , 4,4 , 13,6 , 1958,13 , 1971,8 , 2, 1, 1, 6, 7 }, // Malay/AnyScript/Malaysia - { 76, 0, 32, 44, 46, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 239,10 , 249,9 , 547,7 , 560,12 , 18,7 , 25,12 , 8855,49 , 8904,82 , 8986,24 , 8961,49 , 9010,82 , 9092,24 , 5982,28 , 6010,43 , 6053,14 , 5982,28 , 6010,43 , 6053,14 , 208,2 , 186,3 , {66,78,68}, 12,1 , 4402,19 , 8,5 , 4,0 , 1958,13 , 1979,6 , 2, 1, 1, 6, 7 }, // Malay/AnyScript/BruneiDarussalam -- { 77, 0, 100, 46, 44, 59, 37, 3430, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 312,13 , 325,12 , 27,8 , 795,18 , 18,7 , 25,12 , 9010,66 , 9076,101 , 9177,31 , 9116,66 , 9182,101 , 9283,31 , 6067,47 , 6114,70 , 6184,22 , 6067,47 , 6114,70 , 6184,22 , 210,6 , 189,10 , {73,78,82}, 203,2 , 4421,46 , 0,4 , 4,0 , 1985,6 , 1991,6 , 2, 1, 7, 7, 7 }, // Malayalam/AnyScript/India -+ { 77, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 312,13 , 325,12 , 27,8 , 795,18 , 18,7 , 25,12 , 9010,66 , 9076,101 , 9177,31 , 9116,66 , 9182,101 , 9283,31 , 6067,47 , 6114,70 , 6184,22 , 6067,47 , 6114,70 , 6184,22 , 210,6 , 189,10 , {73,78,82}, 203,2 , 4421,46 , 0,4 , 4,0 , 1985,6 , 1991,6 , 2, 1, 7, 7, 7 }, // Malayalam/AnyScript/India - { 78, 0, 133, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 813,23 , 37,5 , 8,10 , 9208,48 , 9256,86 , 9342,24 , 9314,48 , 9362,86 , 9448,24 , 6206,28 , 6234,63 , 6297,14 , 6206,28 , 6234,63 , 6297,14 , 216,2 , 199,2 , {69,85,82}, 112,1 , 4467,11 , 4,4 , 4,0 , 1997,5 , 774,5 , 2, 1, 7, 6, 7 }, // Maltese/AnyScript/Malta -- { 80, 0, 100, 1643, 1644, 1563, 1642, 2406, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 337,9 , 337,9 , 634,6 , 99,16 , 417,7 , 424,12 , 9366,69 , 9435,86 , 9521,32 , 9472,69 , 9541,86 , 9627,32 , 6311,32 , 6343,53 , 4078,19 , 6311,32 , 6343,53 , 4078,19 , 218,5 , 201,5 , {73,78,82}, 205,2 , 4478,19 , 8,5 , 4,0 , 2002,5 , 1640,4 , 2, 1, 7, 7, 7 }, // Marathi/AnyScript/India -+ { 80, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 337,9 , 337,9 , 634,6 , 99,16 , 417,7 , 424,12 , 9366,69 , 9435,86 , 9521,32 , 9472,69 , 9541,86 , 9627,32 , 6311,32 , 6343,53 , 4078,19 , 6311,32 , 6343,53 , 4078,19 , 218,5 , 201,5 , {73,78,82}, 205,2 , 4478,19 , 8,5 , 4,0 , 2002,5 , 1640,4 , 2, 1, 7, 7, 7 }, // Marathi/AnyScript/India - { 82, 0, 143, 44, 160, 59, 37, 48, 45, 43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9553,48 , 9601,66 , 1381,27 , 9659,48 , 9707,66 , 134,27 , 6396,21 , 6417,43 , 708,14 , 6396,21 , 6417,43 , 708,14 , 0,2 , 0,2 , {77,78,84}, 207,1 , 0,7 , 8,5 , 4,0 , 2007,6 , 2013,10 , 0, 0, 1, 6, 7 }, // Mongolian/AnyScript/Mongolia - { 82, 0, 44, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1381,27 , 1381,27 , 1381,27 , 134,27 , 134,27 , 134,27 , 708,14 , 708,14 , 708,14 , 708,14 , 708,14 , 708,14 , 0,2 , 0,2 , {67,78,89}, 208,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 7, 6, 7 }, // Mongolian/AnyScript/China - { 82, 2, 143, 44, 160, 59, 37, 48, 45, 43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9553,48 , 9601,66 , 1381,27 , 9659,48 , 9707,66 , 134,27 , 6396,21 , 6417,43 , 708,14 , 6396,21 , 6417,43 , 708,14 , 0,2 , 0,2 , {77,78,84}, 207,1 , 0,7 , 8,5 , 4,0 , 2007,6 , 2013,10 , 0, 0, 1, 6, 7 }, // Mongolian/Cyrillic/Mongolia - { 82, 8, 44, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1381,27 , 1381,27 , 1381,27 , 134,27 , 134,27 , 134,27 , 708,14 , 708,14 , 708,14 , 708,14 , 708,14 , 708,14 , 0,2 , 0,2 , {67,78,89}, 208,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 7, 6, 7 }, // Mongolian/Mongolian/China -- { 84, 0, 150, 46, 44, 59, 1642, 2406, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9667,56 , 9723,85 , 9808,27 , 9773,56 , 9829,85 , 9914,27 , 6460,33 , 6493,54 , 6547,14 , 6460,33 , 6493,54 , 6547,14 , 223,14 , 206,14 , {78,80,82}, 211,4 , 0,7 , 8,5 , 4,0 , 2023,6 , 2029,5 , 2, 1, 7, 6, 7 }, // Nepali/AnyScript/Nepal -- { 84, 0, 100, 46, 44, 59, 1642, 2406, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9667,56 , 9835,80 , 9808,27 , 9773,56 , 9941,80 , 9914,27 , 6460,33 , 6561,54 , 6547,14 , 6460,33 , 6561,54 , 6547,14 , 136,9 , 125,7 , {73,78,82}, 114,1 , 4497,49 , 8,5 , 4,0 , 2023,6 , 1640,4 , 2, 1, 7, 7, 7 }, // Nepali/AnyScript/India -+ { 84, 0, 150, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9667,56 , 9723,85 , 9808,27 , 9773,56 , 9829,85 , 9914,27 , 6460,33 , 6493,54 , 6547,14 , 6460,33 , 6493,54 , 6547,14 , 223,14 , 206,14 , {78,80,82}, 211,4 , 0,7 , 8,5 , 4,0 , 2023,6 , 2029,5 , 2, 1, 7, 6, 7 }, // Nepali/AnyScript/Nepal -+ { 84, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9667,56 , 9835,80 , 9808,27 , 9773,56 , 9941,80 , 9914,27 , 6460,33 , 6561,54 , 6547,14 , 6460,33 , 6561,54 , 6547,14 , 136,9 , 125,7 , {73,78,82}, 114,1 , 4497,49 , 8,5 , 4,0 , 2023,6 , 1640,4 , 2, 1, 7, 7, 7 }, // Nepali/AnyScript/India - { 85, 0, 161, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 111,8 , 111,8 , 332,8 , 836,17 , 37,5 , 436,16 , 4293,48 , 9915,83 , 134,24 , 10021,59 , 10080,83 , 320,24 , 6615,28 , 2293,51 , 2344,14 , 6643,35 , 2293,51 , 2344,14 , 0,2 , 0,2 , {78,79,75}, 131,2 , 4546,44 , 8,5 , 4,0 , 2034,12 , 2046,5 , 2, 1, 1, 6, 7 }, // Norwegian/AnyScript/Norway - { 86, 0, 74, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9998,83 , 9998,83 , 1381,27 , 10163,83 , 10163,83 , 134,27 , 6678,57 , 6678,57 , 708,14 , 6678,57 , 6678,57 , 708,14 , 0,2 , 0,2 , {69,85,82}, 112,1 , 1510,11 , 8,5 , 4,0 , 2051,7 , 2058,6 , 2, 1, 1, 6, 7 }, // Occitan/AnyScript/France - { 87, 0, 100, 46, 44, 1563, 1642, 2918, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 634,6 , 10,17 , 18,7 , 25,12 , 10081,89 , 10081,89 , 10170,32 , 10246,89 , 10246,89 , 10335,32 , 6735,33 , 6768,54 , 6822,18 , 6735,33 , 6768,54 , 6822,18 , 237,2 , 220,2 , {73,78,82}, 114,1 , 4590,11 , 8,5 , 4,0 , 2064,5 , 2069,4 , 2, 1, 7, 7, 7 }, // Oriya/AnyScript/India -@@ -526,10 +526,10 @@ static const QLocalePrivate locale_data[] = { - { 91, 0, 92, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 154,7 , 154,7 , 27,8 , 883,27 , 37,5 , 195,9 , 10557,48 , 10605,89 , 134,24 , 10836,48 , 10884,89 , 320,24 , 7010,28 , 7038,79 , 7117,14 , 7010,28 , 7038,79 , 7117,14 , 61,4 , 59,4 , {88,79,70}, 168,3 , 4859,62 , 25,5 , 4,0 , 2136,9 , 2176,12 , 0, 0, 1, 6, 7 }, // Portuguese/AnyScript/GuineaBissau - { 91, 0, 146, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 154,7 , 154,7 , 27,8 , 883,27 , 37,5 , 195,9 , 10557,48 , 10605,89 , 134,24 , 10836,48 , 10884,89 , 320,24 , 7010,28 , 7038,79 , 7117,14 , 7010,28 , 7038,79 , 7117,14 , 61,4 , 59,4 , {77,90,78}, 223,3 , 4921,72 , 25,5 , 4,0 , 2136,9 , 2188,10 , 2, 1, 7, 6, 7 }, // Portuguese/AnyScript/Mozambique - { 91, 0, 185, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 154,7 , 154,7 , 27,8 , 883,27 , 37,5 , 195,9 , 10557,48 , 10605,89 , 134,24 , 10836,48 , 10884,89 , 320,24 , 7010,28 , 7038,79 , 7117,14 , 7010,28 , 7038,79 , 7117,14 , 61,4 , 59,4 , {83,84,68}, 226,2 , 4993,92 , 25,5 , 4,0 , 2136,9 , 2198,19 , 0, 0, 1, 6, 7 }, // Portuguese/AnyScript/SaoTomeAndPrincipe -- { 92, 0, 100, 1643, 1644, 1563, 1642, 2662, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10831,68 , 10831,68 , 10899,27 , 11110,68 , 11110,68 , 11178,27 , 7210,38 , 7248,55 , 7303,23 , 7210,38 , 7248,55 , 7303,23 , 252,11 , 234,11 , {73,78,82}, 228,3 , 5085,12 , 8,5 , 4,0 , 2217,6 , 2223,4 , 2, 1, 7, 7, 7 }, // Punjabi/AnyScript/India -- { 92, 0, 163, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10926,67 , 10926,67 , 1381,27 , 11205,67 , 11205,67 , 134,27 , 7326,37 , 7326,37 , 708,14 , 7326,37 , 7326,37 , 708,14 , 0,2 , 0,2 , {80,75,82}, 231,1 , 5097,13 , 8,5 , 4,0 , 2227,5 , 2232,6 , 0, 0, 7, 6, 7 }, // Punjabi/AnyScript/Pakistan -+ { 92, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10831,68 , 10831,68 , 10899,27 , 11110,68 , 11110,68 , 11178,27 , 7210,38 , 7248,55 , 7303,23 , 7210,38 , 7248,55 , 7303,23 , 252,11 , 234,11 , {73,78,82}, 228,3 , 5085,12 , 8,5 , 4,0 , 2217,6 , 2223,4 , 2, 1, 7, 7, 7 }, // Punjabi/AnyScript/India -+ { 92, 0, 163, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10926,67 , 10926,67 , 1381,27 , 11205,67 , 11205,67 , 134,27 , 7326,37 , 7326,37 , 708,14 , 7326,37 , 7326,37 , 708,14 , 0,2 , 0,2 , {80,75,82}, 231,1 , 5097,13 , 8,5 , 4,0 , 2227,5 , 2232,6 , 0, 0, 7, 6, 7 }, // Punjabi/AnyScript/Pakistan - { 92, 1, 163, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10926,67 , 10926,67 , 1381,27 , 11205,67 , 11205,67 , 134,27 , 7326,37 , 7326,37 , 708,14 , 7326,37 , 7326,37 , 708,14 , 0,2 , 0,2 , {80,75,82}, 231,1 , 5097,13 , 8,5 , 4,0 , 2227,5 , 2232,6 , 0, 0, 7, 6, 7 }, // Punjabi/Arabic/Pakistan -- { 92, 4, 100, 1643, 1644, 1563, 1642, 2662, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10831,68 , 10831,68 , 10899,27 , 11110,68 , 11110,68 , 11178,27 , 7210,38 , 7248,55 , 7303,23 , 7210,38 , 7248,55 , 7303,23 , 252,11 , 234,11 , {73,78,82}, 228,3 , 5085,12 , 8,5 , 4,0 , 2217,6 , 2223,4 , 2, 1, 7, 7, 7 }, // Punjabi/Gurmukhi/India -+ { 92, 4, 100, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10831,68 , 10831,68 , 10899,27 , 11110,68 , 11110,68 , 11178,27 , 7210,38 , 7248,55 , 7303,23 , 7210,38 , 7248,55 , 7303,23 , 252,11 , 234,11 , {73,78,82}, 228,3 , 5085,12 , 8,5 , 4,0 , 2217,6 , 2223,4 , 2, 1, 7, 7, 7 }, // Punjabi/Gurmukhi/India - { 94, 0, 206, 46, 8217, 59, 37, 48, 8722, 43, 101, 171, 187, 8249, 8250, 0,6 , 0,6 , 0,6 , 0,6 , 332,8 , 498,18 , 37,5 , 8,10 , 10993,67 , 11060,92 , 11152,24 , 11272,67 , 11339,92 , 11431,24 , 7363,23 , 7386,56 , 7442,14 , 7363,23 , 7386,56 , 7442,14 , 237,2 , 245,2 , {67,72,70}, 0,0 , 5110,20 , 25,5 , 4,0 , 2238,9 , 2247,6 , 2, 5, 1, 6, 7 }, // RhaetoRomance/AnyScript/Switzerland - { 95, 0, 141, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8221, 171, 187, 0,6 , 0,6 , 359,8 , 359,8 , 873,10 , 10,17 , 37,5 , 8,10 , 11176,60 , 11236,98 , 11334,24 , 11455,60 , 11515,98 , 11613,24 , 7456,21 , 7477,48 , 3070,14 , 7456,21 , 7477,48 , 3070,14 , 0,2 , 0,2 , {77,68,76}, 232,3 , 5130,69 , 25,5 , 4,0 , 2253,6 , 2259,17 , 2, 1, 1, 6, 7 }, // Romanian/AnyScript/Moldova - { 95, 0, 177, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8221, 171, 187, 0,6 , 0,6 , 359,8 , 359,8 , 873,10 , 10,17 , 37,5 , 8,10 , 11176,60 , 11236,98 , 11334,24 , 11455,60 , 11515,98 , 11613,24 , 7456,21 , 7477,48 , 3070,14 , 7456,21 , 7477,48 , 3070,14 , 0,2 , 0,2 , {82,79,78}, 0,0 , 5199,57 , 25,5 , 4,0 , 2253,6 , 2276,7 , 2, 1, 1, 6, 7 }, // Romanian/AnyScript/Romania -@@ -562,7 +562,7 @@ static const QLocalePrivate locale_data[] = { - { 106, 0, 198, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 572,10 , 959,17 , 522,7 , 25,12 , 12541,59 , 12600,96 , 12696,32 , 12808,61 , 12869,96 , 12965,32 , 8367,30 , 8397,62 , 8459,19 , 8367,30 , 8397,62 , 8459,19 , 293,5 , 276,4 , {76,75,82}, 256,3 , 6172,19 , 4,4 , 13,6 , 2496,5 , 2501,11 , 2, 1, 1, 6, 7 }, // Singhalese/AnyScript/SriLanka - { 107, 0, 195, 44, 160, 59, 37, 48, 45, 43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12728,48 , 12776,114 , 1381,27 , 12997,48 , 13045,114 , 134,27 , 8478,27 , 8505,68 , 708,14 , 8478,27 , 8505,68 , 708,14 , 0,2 , 0,2 , {90,65,82}, 11,1 , 0,7 , 4,4 , 4,0 , 2512,7 , 0,0 , 2, 1, 7, 6, 7 }, // Siswati/AnyScript/SouthAfrica - { 107, 0, 204, 44, 160, 59, 37, 48, 45, 43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12728,48 , 12776,114 , 1381,27 , 12997,48 , 13045,114 , 134,27 , 8478,27 , 8505,68 , 708,14 , 8478,27 , 8505,68 , 708,14 , 0,2 , 0,2 , {83,90,76}, 259,1 , 0,7 , 4,4 , 4,0 , 2512,7 , 0,0 , 2, 1, 1, 6, 7 }, // Siswati/AnyScript/Swaziland -- { 108, 0, 191, 1643, 1644, 1563, 1642, 1632, 45, 43, 101, 8218, 8216, 8222, 8220, 0,6 , 0,6 , 104,7 , 104,7 , 582,8 , 498,18 , 165,4 , 195,9 , 12890,48 , 12938,82 , 12028,24 , 13159,48 , 13207,89 , 12295,24 , 8573,21 , 8594,52 , 8646,14 , 8573,21 , 8594,52 , 8646,14 , 298,10 , 280,9 , {69,85,82}, 112,1 , 6191,28 , 25,5 , 4,0 , 2519,10 , 2529,19 , 2, 1, 1, 6, 7 }, // Slovak/AnyScript/Slovakia -+ { 108, 0, 191, 44, 160, 44, 37, 48, 45, 43, 101, 8218, 8216, 8222, 8220, 0,6 , 0,6 , 104,7 , 104,7 , 582,8 , 498,18 , 165,4 , 195,9 , 12890,48 , 12938,82 , 12028,24 , 13159,48 , 13207,89 , 12295,24 , 8573,21 , 8594,52 , 8646,14 , 8573,21 , 8594,52 , 8646,14 , 298,10 , 280,9 , {69,85,82}, 112,1 , 6191,28 , 25,5 , 4,0 , 2519,10 , 2529,19 , 2, 1, 1, 6, 7 }, // Slovak/AnyScript/Slovakia - { 109, 0, 192, 44, 46, 59, 37, 48, 45, 43, 101, 187, 171, 8222, 8220, 0,6 , 0,6 , 367,8 , 367,8 , 976,9 , 590,19 , 37,5 , 8,10 , 11899,48 , 13020,86 , 12028,24 , 13296,59 , 13355,86 , 12295,24 , 8660,28 , 8688,52 , 8740,14 , 8754,35 , 8688,52 , 8740,14 , 78,4 , 289,4 , {69,85,82}, 112,1 , 6219,28 , 25,5 , 4,0 , 2548,11 , 2559,9 , 2, 1, 1, 6, 7 }, // Slovenian/AnyScript/Slovenia - { 110, 0, 194, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 13106,48 , 13154,189 , 13343,24 , 13441,48 , 13489,189 , 13678,24 , 8789,28 , 8817,47 , 8864,14 , 8789,28 , 8817,47 , 8864,14 , 308,3 , 293,3 , {83,79,83}, 0,0 , 6247,22 , 4,4 , 4,0 , 2568,8 , 2576,10 , 0, 0, 1, 6, 7 }, // Somali/AnyScript/Somalia - { 110, 0, 59, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 13106,48 , 13154,189 , 13343,24 , 13441,48 , 13489,189 , 13678,24 , 8789,28 , 8817,47 , 8864,14 , 8789,28 , 8817,47 , 8864,14 , 308,3 , 293,3 , {68,74,70}, 5,3 , 6269,21 , 4,4 , 4,0 , 2568,8 , 2586,7 , 0, 0, 6, 6, 7 }, // Somali/AnyScript/Djibouti -@@ -597,9 +597,9 @@ static const QLocalePrivate locale_data[] = { - { 115, 0, 170, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 408,8 , 408,8 , 554,6 , 1068,18 , 37,5 , 8,10 , 13747,48 , 13795,88 , 13883,24 , 14081,48 , 14129,88 , 14217,24 , 9162,28 , 9190,55 , 9245,14 , 9259,28 , 9190,55 , 9245,14 , 0,2 , 0,2 , {80,72,80}, 139,1 , 7392,22 , 8,5 , 4,0 , 2896,7 , 2903,9 , 2, 1, 7, 6, 7 }, // Tagalog/AnyScript/Philippines - { 116, 0, 209, 46, 44, 59, 37, 48, 45, 43, 101, 171, 187, 171, 8222, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13907,48 , 13955,71 , 1381,27 , 14241,48 , 14289,71 , 134,27 , 9287,28 , 9315,55 , 708,14 , 9287,28 , 9315,55 , 708,14 , 0,2 , 0,2 , {84,74,83}, 186,3 , 7414,13 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Tajik/AnyScript/Tajikistan - { 116, 2, 209, 46, 44, 59, 37, 48, 45, 43, 101, 171, 187, 171, 8222, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13907,48 , 13955,71 , 1381,27 , 14241,48 , 14289,71 , 134,27 , 9287,28 , 9315,55 , 708,14 , 9287,28 , 9315,55 , 708,14 , 0,2 , 0,2 , {84,74,83}, 186,3 , 7414,13 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Tajik/Cyrillic/Tajikistan -- { 117, 0, 100, 46, 44, 1563, 1642, 3046, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 416,13 , 416,13 , 634,6 , 203,18 , 18,7 , 25,12 , 14026,58 , 14084,86 , 14170,31 , 14360,58 , 14418,86 , 14504,31 , 9370,20 , 9390,49 , 9370,20 , 9370,20 , 9390,49 , 9370,20 , 320,8 , 305,8 , {73,78,82}, 114,1 , 7427,13 , 8,5 , 4,0 , 2912,5 , 2917,7 , 2, 1, 7, 7, 7 }, // Tamil/AnyScript/India -- { 117, 0, 198, 46, 44, 1563, 1642, 3046, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 416,13 , 416,13 , 634,6 , 203,18 , 18,7 , 25,12 , 14026,58 , 14084,86 , 14170,31 , 14360,58 , 14418,86 , 14504,31 , 9370,20 , 9390,49 , 9370,20 , 9370,20 , 9390,49 , 9370,20 , 320,8 , 305,8 , {76,75,82}, 282,3 , 7440,20 , 8,5 , 4,0 , 2912,5 , 2924,6 , 2, 1, 1, 6, 7 }, // Tamil/AnyScript/SriLanka -- { 119, 0, 100, 1643, 1644, 1563, 1642, 3174, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 429,11 , 429,11 , 539,8 , 99,16 , 18,7 , 25,12 , 14201,78 , 14279,86 , 14365,30 , 14535,78 , 14613,86 , 14699,31 , 9439,32 , 9471,60 , 9531,18 , 9439,32 , 9471,60 , 9531,18 , 328,10 , 313,8 , {73,78,82}, 285,3 , 7460,13 , 8,5 , 4,0 , 2930,6 , 2936,9 , 2, 1, 7, 7, 7 }, // Telugu/AnyScript/India -+ { 117, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 416,13 , 416,13 , 634,6 , 203,18 , 18,7 , 25,12 , 14026,58 , 14084,86 , 14170,31 , 14360,58 , 14418,86 , 14504,31 , 9370,20 , 9390,49 , 9370,20 , 9370,20 , 9390,49 , 9370,20 , 320,8 , 305,8 , {73,78,82}, 114,1 , 7427,13 , 8,5 , 4,0 , 2912,5 , 2917,7 , 2, 1, 7, 7, 7 }, // Tamil/AnyScript/India -+ { 117, 0, 198, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 416,13 , 416,13 , 634,6 , 203,18 , 18,7 , 25,12 , 14026,58 , 14084,86 , 14170,31 , 14360,58 , 14418,86 , 14504,31 , 9370,20 , 9390,49 , 9370,20 , 9370,20 , 9390,49 , 9370,20 , 320,8 , 305,8 , {76,75,82}, 282,3 , 7440,20 , 8,5 , 4,0 , 2912,5 , 2924,6 , 2, 1, 1, 6, 7 }, // Tamil/AnyScript/SriLanka -+ { 119, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 429,11 , 429,11 , 539,8 , 99,16 , 18,7 , 25,12 , 14201,78 , 14279,86 , 14365,30 , 14535,78 , 14613,86 , 14699,31 , 9439,32 , 9471,60 , 9531,18 , 9439,32 , 9471,60 , 9531,18 , 328,10 , 313,8 , {73,78,82}, 285,3 , 7460,13 , 8,5 , 4,0 , 2930,6 , 2936,9 , 2, 1, 7, 7, 7 }, // Telugu/AnyScript/India - { 120, 0, 211, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 440,5 , 440,5 , 445,8 , 453,7 , 364,8 , 1086,19 , 165,4 , 558,27 , 14395,63 , 14458,98 , 14395,63 , 14730,63 , 14793,98 , 14891,62 , 9549,23 , 9572,68 , 9640,14 , 9549,23 , 9572,68 , 9640,14 , 338,10 , 321,10 , {84,72,66}, 288,1 , 7473,13 , 4,4 , 48,5 , 2945,3 , 2945,3 , 2, 1, 7, 6, 7 }, // Thai/AnyScript/Thailand - { 121, 0, 44, 46, 44, 1563, 1642, 3872, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 14556,63 , 14619,158 , 1381,27 , 14953,63 , 15016,158 , 134,27 , 9654,51 , 9705,79 , 9784,21 , 9805,49 , 9854,77 , 9931,22 , 348,7 , 331,8 , {67,78,89}, 208,3 , 7486,13 , 8,5 , 4,0 , 2948,8 , 2956,6 , 2, 1, 7, 6, 7 }, // Tibetan/AnyScript/China - { 121, 0, 100, 46, 44, 1563, 1642, 3872, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 14556,63 , 14619,158 , 1381,27 , 14953,63 , 15016,158 , 134,27 , 9654,51 , 9705,79 , 9784,21 , 9805,49 , 9854,77 , 9931,22 , 348,7 , 331,8 , {73,78,82}, 114,1 , 7499,22 , 8,5 , 4,0 , 2948,8 , 2962,7 , 2, 1, 7, 7, 7 }, // Tibetan/AnyScript/India -@@ -612,7 +612,7 @@ static const QLocalePrivate locale_data[] = { - { 130, 0, 100, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 34, 34, 39, 39, 31,6 , 31,6 , 476,10 , 486,9 , 279,6 , 1189,18 , 18,7 , 25,12 , 15523,67 , 15523,67 , 1381,27 , 15931,67 , 15931,67 , 134,27 , 10414,36 , 10414,36 , 708,14 , 10414,36 , 10414,36 , 708,14 , 364,2 , 348,3 , {73,78,82}, 114,1 , 7588,18 , 8,5 , 4,0 , 3033,4 , 3037,5 , 2, 1, 7, 7, 7 }, // Urdu/AnyScript/India - { 130, 0, 163, 46, 44, 59, 37, 48, 45, 43, 101, 34, 34, 39, 39, 31,6 , 31,6 , 476,10 , 486,9 , 279,6 , 1189,18 , 18,7 , 25,12 , 15523,67 , 15523,67 , 1381,27 , 15931,67 , 15931,67 , 134,27 , 10414,36 , 10414,36 , 708,14 , 10414,36 , 10414,36 , 708,14 , 364,2 , 348,3 , {80,75,82}, 291,4 , 7606,21 , 4,4 , 4,0 , 3033,4 , 3042,7 , 0, 0, 7, 6, 7 }, // Urdu/AnyScript/Pakistan - { 131, 0, 228, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13907,48 , 15590,115 , 11500,24 , 14241,48 , 15998,115 , 11767,24 , 10450,28 , 10478,53 , 10531,14 , 10450,28 , 10478,53 , 10531,14 , 0,2 , 0,2 , {85,90,83}, 295,3 , 7627,21 , 8,5 , 4,0 , 3049,5 , 3054,10 , 0, 0, 1, 6, 7 }, // Uzbek/AnyScript/Uzbekistan -- { 131, 0, 1, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 179,8 , 1207,33 , 165,4 , 452,11 , 15705,48 , 15753,68 , 1381,27 , 16113,48 , 10597,68 , 134,27 , 10545,21 , 6840,49 , 708,14 , 10545,21 , 6840,49 , 708,14 , 0,2 , 0,2 , {65,70,78}, 215,1 , 7648,13 , 25,5 , 4,0 , 3064,6 , 2077,9 , 0, 0, 6, 4, 5 }, // Uzbek/AnyScript/Afghanistan -+ { 131, 0, 1, 44, 46, 59, 37, 48, 8722, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 179,8 , 1207,33 , 165,4 , 452,11 , 15705,48 , 15753,68 , 1381,27 , 16113,48 , 10597,68 , 134,27 , 10545,21 , 6840,49 , 708,14 , 10545,21 , 6840,49 , 708,14 , 0,2 , 0,2 , {65,70,78}, 215,1 , 7648,13 , 25,5 , 4,0 , 3064,6 , 2077,9 , 0, 0, 6, 4, 5 }, // Uzbek/AnyScript/Afghanistan - { 131, 1, 1, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 179,8 , 1207,33 , 165,4 , 452,11 , 15705,48 , 15753,68 , 1381,27 , 16113,48 , 10597,68 , 134,27 , 10545,21 , 6840,49 , 708,14 , 10545,21 , 6840,49 , 708,14 , 0,2 , 0,2 , {65,70,78}, 215,1 , 7648,13 , 25,5 , 4,0 , 3064,6 , 2077,9 , 0, 0, 6, 4, 5 }, // Uzbek/Arabic/Afghanistan - { 131, 2, 228, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13907,48 , 15590,115 , 11500,24 , 14241,48 , 15998,115 , 11767,24 , 10450,28 , 10478,53 , 10531,14 , 10450,28 , 10478,53 , 10531,14 , 0,2 , 0,2 , {85,90,83}, 295,3 , 7627,21 , 8,5 , 4,0 , 3049,5 , 3054,10 , 0, 0, 1, 6, 7 }, // Uzbek/Cyrillic/Uzbekistan - { 131, 7, 228, 44, 160, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 15821,52 , 15873,77 , 15950,24 , 16161,52 , 16213,77 , 16290,24 , 10566,34 , 10600,61 , 10661,14 , 10566,34 , 10600,61 , 10661,14 , 0,2 , 0,2 , {85,90,83}, 298,4 , 7661,23 , 8,5 , 4,0 , 3070,9 , 3079,11 , 0, 0, 1, 6, 7 }, // Uzbek/Latin/Uzbekistan -@@ -626,7 +626,7 @@ static const QLocalePrivate locale_data[] = { - { 144, 0, 224, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 82,17 , 37,5 , 8,10 , 16911,102 , 17013,140 , 1381,27 , 17245,102 , 17347,140 , 134,27 , 11353,30 , 11383,57 , 708,14 , 11353,30 , 11383,57 , 708,14 , 61,4 , 59,4 , {71,66,80}, 140,1 , 0,7 , 4,4 , 4,0 , 3207,5 , 3212,14 , 2, 1, 1, 6, 7 }, // Manx/AnyScript/UnitedKingdom - { 145, 0, 224, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 99,16 , 37,5 , 8,10 , 17153,46 , 17199,124 , 1381,27 , 17487,46 , 17533,124 , 134,27 , 11440,28 , 11468,60 , 708,14 , 11440,28 , 11468,60 , 708,14 , 61,4 , 59,4 , {71,66,80}, 140,1 , 0,7 , 4,4 , 4,0 , 3226,8 , 3212,14 , 2, 1, 1, 6, 7 }, // Cornish/AnyScript/UnitedKingdom - { 146, 0, 83, 46, 160, 59, 37, 48, 45, 43, 101, 8216, 8217, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 17323,48 , 17371,192 , 1381,27 , 17657,48 , 17705,192 , 134,27 , 11528,28 , 11556,49 , 11605,14 , 11528,28 , 11556,49 , 11605,14 , 382,2 , 369,2 , {71,72,83}, 0,0 , 0,7 , 4,4 , 4,0 , 3234,4 , 3238,5 , 2, 1, 1, 6, 7 }, // Akan/AnyScript/Ghana -- { 147, 0, 100, 1643, 1644, 1563, 1642, 2406, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 634,6 , 99,16 , 18,7 , 25,12 , 17563,87 , 17563,87 , 1381,27 , 17897,87 , 17897,87 , 134,27 , 6311,32 , 11619,55 , 708,14 , 6311,32 , 11619,55 , 708,14 , 218,5 , 201,5 , {73,78,82}, 205,2 , 0,7 , 8,5 , 4,0 , 3243,6 , 1640,4 , 2, 1, 7, 7, 7 }, // Konkani/AnyScript/India -+ { 147, 0, 100, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 634,6 , 99,16 , 18,7 , 25,12 , 17563,87 , 17563,87 , 1381,27 , 17897,87 , 17897,87 , 134,27 , 6311,32 , 11619,55 , 708,14 , 6311,32 , 11619,55 , 708,14 , 218,5 , 201,5 , {73,78,82}, 205,2 , 0,7 , 8,5 , 4,0 , 3243,6 , 1640,4 , 2, 1, 7, 7, 7 }, // Konkani/AnyScript/India - { 148, 0, 83, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 34, 34, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 17650,48 , 17698,94 , 1381,27 , 17984,48 , 18032,94 , 134,27 , 11674,26 , 11700,34 , 708,14 , 11674,26 , 11700,34 , 708,14 , 0,2 , 0,2 , {71,72,83}, 0,0 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Ga/AnyScript/Ghana - { 149, 0, 157, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 17792,48 , 17840,86 , 1381,27 , 18126,48 , 18174,86 , 134,27 , 11734,29 , 11763,57 , 708,14 , 11734,29 , 11763,57 , 708,14 , 384,4 , 371,4 , {78,71,78}, 171,1 , 7826,12 , 4,4 , 13,6 , 3249,4 , 3253,7 , 2, 1, 1, 6, 7 }, // Igbo/AnyScript/Nigeria - { 150, 0, 111, 46, 44, 59, 37, 48, 45, 43, 101, 39, 39, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 17926,48 , 17974,189 , 18163,24 , 18260,48 , 18308,189 , 18497,24 , 11820,28 , 11848,74 , 11922,14 , 11820,28 , 11848,74 , 11922,14 , 388,9 , 375,7 , {75,69,83}, 2,3 , 7838,23 , 4,4 , 13,6 , 3260,7 , 2862,5 , 2, 1, 7, 6, 7 }, // Kamba/AnyScript/Kenya --- -1.8.1.4 - diff --git a/0067-Allow-qmljsdebugger-argument-and-value-to-be-separat.patch b/0067-Allow-qmljsdebugger-argument-and-value-to-be-separat.patch deleted file mode 100644 index 4ac858d..0000000 --- a/0067-Allow-qmljsdebugger-argument-and-value-to-be-separat.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9fbefb4503235b634f91b16018a6fe1a104a3f0d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= -Date: Thu, 11 Oct 2012 11:15:03 +0200 -Subject: [PATCH 067/246] Allow qmljsdebugger argument and value to be - separated by a space - -This change makes it possible to use the QML JS debugger with KDE -applications. - -Change-Id: I1c6615c604a4023062fe6e6ead66dfcea9f8d493 -Reviewed-by: David Faure (KDE) -Reviewed-by: Kai Koehne -Reviewed-by: Friedemann Kleint -(cherry picked from qtbase/fea68274b89a9bcde55eabbf6eb7bf2e8376d930) ---- - src/corelib/kernel/qcoreapplication.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index bb07d74..483c9fe 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -236,6 +236,9 @@ void QCoreApplicationPrivate::processCommandLineArguments() - QByteArray arg = argv[i]; - if (arg.startsWith("-qmljsdebugger=")) { - *qmljs_debug_arguments() = QString::fromLocal8Bit(arg.right(arg.length() - 15)); -+ } else if (arg == "-qmljsdebugger" && i < argc - 1) { -+ ++i; -+ *qmljs_debug_arguments() = QString::fromLocal8Bit(argv[i]); - } else { - argv[j++] = argv[i]; - } -@@ -2319,6 +2322,7 @@ QStringList QCoreApplication::arguments() - l1arg.startsWith("-qmljsdebugger=")) - ; - else if (l1arg == "-style" || -+ l1arg == "-qmljsdebugger" || - l1arg == "-session" || - l1arg == "-graphicssystem" || - l1arg == "-testability") --- -1.8.1.4 - diff --git a/0080-SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch b/0080-SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch deleted file mode 100644 index c2245cc..0000000 --- a/0080-SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001 -From: Peter Hartmann -Date: Fri, 4 Jan 2013 11:06:14 +0100 -Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust - certificates - -Those certificates have erroneously set the CA attribute to true, -meaning everybody in possesion of their keys can issue certificates on -their own. - -backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase - -Task-number: QTBUG-28937 -Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 -Reviewed-by: Richard J. Moore ---- - src/network/ssl/qsslcertificate.cpp | 3 +++ - ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++ - .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++++ - 3 files changed, 58 insertions(+) - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem - -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp -index 038187f..37799d1 100644 ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { - - "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 -+ -+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate -+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate - 0 - }; - -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -new file mode 100644 -index 0000000..33f2ef4 ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -@@ -0,0 +1,24 @@ -+-----BEGIN CERTIFICATE----- -+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow -+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr -+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz -+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA -+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5 -+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R -+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa -+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r -+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF -+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw -+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K -+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l -+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA -+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8 -+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp -+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC -+pWfGWA== -+-----END CERTIFICATE----- -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -new file mode 100644 -index 0000000..e9d048f ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -@@ -0,0 +1,31 @@ -+-----BEGIN CERTIFICATE----- -+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow -+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB -+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE -+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V -+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF -+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO -+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q -+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N -+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS -+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G -+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF -+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF -+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t -+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd -+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy -+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz -+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy -+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn -+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV -+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj -+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU -+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1 -+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I -+hQ== -+-----END CERTIFICATE----- --- -1.8.1 - diff --git a/0090-QtNetwork-blacklist-two-more-certificates.patch b/0090-QtNetwork-blacklist-two-more-certificates.patch deleted file mode 100644 index 83371d0..0000000 --- a/0090-QtNetwork-blacklist-two-more-certificates.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 180bf94c241728dd6d6f100437914d3cb11cbc30 Mon Sep 17 00:00:00 2001 -From: Martin Petersson -Date: Wed, 7 Mar 2012 12:05:59 +0100 -Subject: [PATCH 90/90] QtNetwork: blacklist two more certificates - -The comodogate 72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0 -certificate is a test certificate and the MD5 Collisions was created -as a proof of concept deliberately made to be expired at the time -of it's creation. - -Task-number: QTBUG-24654 -(cherry picked from commit 4c0df9feb2b44d0c4fcaa5076f00aa08fbc1dda5) - -Signed-off-by: Peter Hartmann - -Apparently this commit was forgotten to cherry-pick to Qt 4. - -Change-Id: I86949eaa3c02483b0b66b4a620bfa88aaa9aa99b -Reviewed-by: Richard J. Moore ---- - src/network/ssl/qsslcertificate.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp -index 37799d1..300a261 100644 ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -825,6 +825,8 @@ static const char *certificate_blacklist[] = { - - "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 -+ "72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0", "UTN-USERFirst-Hardware", // comodogate test certificate -+ "41", "MD5 Collisions Inc. (http://www.phreedom.org/md5)", // http://www.phreedom.org/research/rogue-ca/ - - "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate - "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate --- -1.8.1 - diff --git a/0110-QUrl-fromUserInput-fix-for-urls-without-a-host.patch b/0110-QUrl-fromUserInput-fix-for-urls-without-a-host.patch deleted file mode 100644 index 7576321..0000000 --- a/0110-QUrl-fromUserInput-fix-for-urls-without-a-host.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2e97dd401a09e4a9027dea885db7fd95e961a0c5 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Fri, 21 Dec 2012 17:38:19 +0100 -Subject: [PATCH 110/246] QUrl::fromUserInput: fix for urls without a host. - -QUrl::fromUserInput("http://") was invalid, which doesn't make sense -since QUrl("http://") is valid. Same for "smb:" which is actually -even more a valid URL from a user's point of view. - -Change-Id: I371ac393d61b49499edf5adbbc2a90b426fe9e5d -(cherry-picked from qt5 commit 8b2728ec382565c5bd57148600e34740a3c3fe52) -Reviewed-by: David Faure (KDE) ---- - src/corelib/io/qurl.cpp | 3 +-- - tests/auto/qurl/tst_qurl.cpp | 4 ++++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp -index 4b0bc39..551a990 100644 ---- a/src/corelib/io/qurl.cpp -+++ b/src/corelib/io/qurl.cpp -@@ -6684,12 +6684,11 @@ QUrl QUrl::fromUserInput(const QString &userInput) - QUrl url = QUrl::fromEncoded(trimmedString.toUtf8(), QUrl::TolerantMode); - QUrl urlPrepended = QUrl::fromEncoded("http://" + trimmedString.toUtf8(), QUrl::TolerantMode); - -- // Check the most common case of a valid url with scheme and host -+ // Check the most common case of a valid url with a scheme - // We check if the port would be valid by adding the scheme to handle the case host:port - // where the host would be interpretted as the scheme - if (url.isValid() - && !url.scheme().isEmpty() -- && (!url.host().isEmpty() || !url.path().isEmpty()) - && urlPrepended.port() == -1) - return url; - --- -1.8.1.4 - diff --git a/0112-Limit-the-range-of-the-QUrlPrivate-port-to-1-to-6553.patch b/0112-Limit-the-range-of-the-QUrlPrivate-port-to-1-to-6553.patch deleted file mode 100644 index d3b6f46..0000000 --- a/0112-Limit-the-range-of-the-QUrlPrivate-port-to-1-to-6553.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a17fc85b51a6bdcfa33dcff183d2b7efd667fb92 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Tue, 8 Jan 2013 12:34:46 -0200 -Subject: [PATCH 112/246] Limit the range of the QUrlPrivate::port to -1 to - 65535 - -The internal parser can read values outside this range (and cannot -report an error), but QUrl::port() must not return something outside -that range. The correct solution would be to report an error, like in -Qt 5, but that cannot easily be done. - -The rewritten parser in Qt 5 is not affected by this issue. - -Task-number: QTBUG-28985 -Change-Id: I3cf595384f14272197dcfb85943213c8f8ddeba0 -Reviewed-by: David Faure (KDE) ---- - src/corelib/io/qurl.cpp | 2 +- - tests/auto/qurl/tst_qurl.cpp | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp -index 551a990..cf84eb5 100644 ---- a/src/corelib/io/qurl.cpp -+++ b/src/corelib/io/qurl.cpp -@@ -3920,7 +3920,7 @@ void QUrlPrivate::parse(ParseOptions parseOptions) const - - QByteArray h(parseData.host, parseData.hostLength); - that->host = fromPercentEncodingMutable(&h); -- that->port = parseData.port; -+ that->port = uint(parseData.port) <= 0xffffU ? parseData.port : -1; - - that->path.clear(); - that->encodedPath = QByteArray(parseData.path, parseData.pathLength); --- -1.8.1.4 - diff --git a/0124-QtDBus-Garbage-collect-deleted-objects-now-and-then.patch b/0124-QtDBus-Garbage-collect-deleted-objects-now-and-then.patch deleted file mode 100644 index 8dd065f..0000000 --- a/0124-QtDBus-Garbage-collect-deleted-objects-now-and-then.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cf5442551196c3e7e06e6de85c5f8a198b0ff001 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 15 Jan 2013 18:41:27 +0100 -Subject: [PATCH 124/246] QtDBus: Garbage collect deleted objects now and then. - -Fixes performance issues in apps which register and deregister objects -very frequently (like nepomukstorage). - -Change-Id: Id7d6ef508336758c55fa894868241f143b3e30e0 -Backport-Of: ac9ab9703ff299c94dca7585d5a12ecde28931bb -Reviewed-by: Thiago Macieira ---- - src/dbus/qdbusintegrator.cpp | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp -index f8bba28..96e4a12 100644 ---- a/src/dbus/qdbusintegrator.cpp -+++ b/src/dbus/qdbusintegrator.cpp -@@ -2216,6 +2216,19 @@ QDBusConnectionPrivate::disconnectSignal(SignalHookHash::Iterator &it) - return signalHooks.erase(it); - } - -+ -+static void cleanupDeletedNodes(QDBusConnectionPrivate::ObjectTreeNode &parent) -+{ -+ QMutableVectorIterator it(parent.children); -+ while (it.hasNext()) { -+ QDBusConnectionPrivate::ObjectTreeNode& node = it.next(); -+ if (node.obj == 0 && node.children.isEmpty()) -+ it.remove(); -+ else -+ cleanupDeletedNodes(node); -+ } -+} -+ - void QDBusConnectionPrivate::registerObject(const ObjectTreeNode *node) - { - connect(node->obj, SIGNAL(destroyed(QObject*)), SLOT(objectDestroyed(QObject*)), -@@ -2239,6 +2252,10 @@ void QDBusConnectionPrivate::registerObject(const ObjectTreeNode *node) - this, SLOT(relaySignal(QObject*,const QMetaObject*,int,QVariantList)), - Qt::DirectConnection); - } -+ -+ static int counter = 0; -+ if ((++counter % 20) == 0) -+ cleanupDeletedNodes(rootNode); - } - - void QDBusConnectionPrivate::connectRelay(const QString &service, --- -1.8.1.4 - diff --git a/0125-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch b/0125-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch deleted file mode 100644 index 6d1d78a..0000000 --- a/0125-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f45cdeda88796830b3fe71aff7ceb1919d00400d Mon Sep 17 00:00:00 2001 -From: Aurelien Lourot -Date: Thu, 10 Jan 2013 22:28:37 +0100 -Subject: [PATCH 125/246] QTBUG-15319: fix shortcuts with secondary Xkb layout. - -Change-Id: Iadb89137ec017b9dcd4d1588fd582ea46a9d7cc1 -Reviewed-by: Aurelien -Reviewed-by: David Faure (KDE) -Reviewed-by: Lars Knoll ---- - src/gui/kernel/qkeymapper_x11.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp -index 7daa41d..005ff3f 100644 ---- a/src/gui/kernel/qkeymapper_x11.cpp -+++ b/src/gui/kernel/qkeymapper_x11.cpp -@@ -282,9 +282,12 @@ QList QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event) - - // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must - // always use them when determining the baseKeySym) -+ // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to -+ // XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers. -+ // See https://bugreports.qt-project.org/browse/QTBUG-15319 . - KeySym baseKeySym; - uint consumedModifiers; -- if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)), -+ if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)), - &consumedModifiers, &baseKeySym)) - return QList(); - --- -1.8.1.4 - diff --git a/0214-Fix-multiselection-by-CTRL-click-in-QFileDialog-KDE.patch b/0214-Fix-multiselection-by-CTRL-click-in-QFileDialog-KDE.patch deleted file mode 100644 index de7f7b3..0000000 --- a/0214-Fix-multiselection-by-CTRL-click-in-QFileDialog-KDE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e3cc56d532edc97291b4f5a6c95db8b0ed8b3fe8 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Fri, 15 Feb 2013 11:28:28 +0100 -Subject: [PATCH 214/246] Fix multiselection by CTRL-click in QFileDialog/KDE. - -Task-number: QTBUG-29257 - -Change-Id: Idfac80e855455a4537dd38a23136762cd9398e15 -Reviewed-by: David Faure (KDE) -Reviewed-by: Frederik Gladhorn -(cherry picked from qtbase/b6ccdfa4823d4608f5cb94797b48fc82b8833581) ---- - src/gui/dialogs/qfiledialog.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp -index aeb84f4..92ffedc 100644 ---- a/src/gui/dialogs/qfiledialog.cpp -+++ b/src/gui/dialogs/qfiledialog.cpp -@@ -3001,7 +3001,11 @@ void QFileDialogPrivate::_q_enterDirectory(const QModelIndex &index) - lineEdit()->clear(); - } - } else { -- q->accept(); -+ // Do not accept when shift-clicking to multi-select a file in environments with single-click-activation (KDE) -+ if (!q->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) -+ || q->fileMode() != QFileDialog::ExistingFiles || !(QApplication::keyboardModifiers() & Qt::CTRL)) { -+ q->accept(); -+ } - } - } - --- -1.8.1.4 - diff --git a/qt-4.8-CVE-2013-0254.patch b/qt-4.8-CVE-2013-0254.patch deleted file mode 100644 index bc2de3f..0000000 --- a/qt-4.8-CVE-2013-0254.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Sat, 22 Dec 2012 08:32:12 -0800 -Subject: [PATCH] Change all shmget calls to user-only memory - -Drop the read and write permissions for group and other users in the -system. - -Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 -(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) -Reviewed-by: Richard J. Moore ---- - src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- - src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- - src/gui/image/qnativeimage.cpp | 2 +- - src/gui/image/qpixmap_x11.cpp | 2 +- - src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +- - src/plugins/platforms/xlib/qxlibwindowsurface.cpp | 2 +- - .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp | 2 +- - tools/qvfb/qvfbshmem.cpp | 4 ++-- - 8 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp -index 20d76e3..4cf3acf 100644 ---- a/src/corelib/kernel/qsharedmemory_unix.cpp -+++ b/src/corelib/kernel/qsharedmemory_unix.cpp -@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) - } - - // create -- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { -+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { - QString function = QLatin1String("QSharedMemory::create"); - switch (errno) { - case EINVAL: -@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) - { - #ifndef QT_POSIX_IPC - // grab the shared memory segment id -- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); -+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); - if (-1 == id) { - setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); - return false; -@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() - size = 0; - - // Get the number of current attachments -- int id = shmget(unix_key, 0, 0444); -+ int id = shmget(unix_key, 0, 0400); - cleanHandle(); - - struct shmid_ds shmid_ds; -diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp -index fad9acc..e77456b 100644 ---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp -+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp -@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) - } - - // Get semaphore -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); - if (-1 == semaphore) { - if (errno == EEXIST) -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); - if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); - cleanHandle(); -diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp -index 9654afe..fef38c5 100644 ---- a/src/gui/image/qnativeimage.cpp -+++ b/src/gui/image/qnativeimage.cpp -@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* - - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp -index 280d8bd..88c9b7b 100644 ---- a/src/gui/image/qpixmap_x11.cpp -+++ b/src/gui/image/qpixmap_x11.cpp -@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h) - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, - xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -index b6a42d8..0d56821 100644 ---- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI - 0); - - m_shm_info.shmid = shmget (IPC_PRIVATE, -- m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777); -+ m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600); - - m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0); - m_shm_info.shmseg = xcb_generate_id(xcb_connection()); -diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -index bf003eb..46a2f97 100644 ---- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height) - - - image_info->shminfo.shmid = shmget (IPC_PRIVATE, -- image->bytes_per_line * image->height, IPC_CREAT|0777); -+ image->bytes_per_line * image->height, IPC_CREAT|0700); - - image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0); - image_info->shminfo.readOnly = False; -diff --git a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp -index 9e77af6..e92a030 100644 -diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp -index 7f9671f..84b6ebe 100644 ---- a/tools/qvfb/qvfbshmem.cpp -+++ b/tools/qvfb/qvfbshmem.cpp -@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s, - uint data_offset_value = sizeof(QVFbHeader); - - int dataSize = bpl * h + data_offset_value; -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId != -1) - data = (unsigned char *)shmat(shmId, 0, 0); - else { - struct shmid_ds shm; - shmctl(shmId, IPC_RMID, &shm); -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId == -1) { - perror("QShMemViewProtocol::QShMemViewProtocol"); - qFatal("Cannot get shared memory 0x%08x", key); --- -1.7.1 - diff --git a/qt-4.8.0-CVE-2011-3922-bz#772125.patch b/qt-4.8.0-CVE-2011-3922-bz#772125.patch deleted file mode 100644 index 31f3b9f..0000000 --- a/qt-4.8.0-CVE-2011-3922-bz#772125.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c.bz#772125 2012-01-09 10:16:08.000000000 +0100 -+++ qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c 2012-01-09 10:16:47.000000000 +0100 -@@ -359,7 +359,8 @@ - if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) { - reordered[len] = Mymr_C_NGA; - reordered[len+1] = Mymr_C_VIRAMA; -- properties[len-1] = AboveForm; -+ if (len > 0) -+ properties[len-1] = AboveForm; - properties[len] = AboveForm; - len += 2; - kinzi = -1; diff --git a/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch b/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch deleted file mode 100644 index 1283f50..0000000 --- a/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch +++ /dev/null @@ -1,27 +0,0 @@ - -Fails to create debug build of Qt projects on mingw -http://bugzilla.redhat.com/653674 -http://bugreports.qt.nokia.com/browse/QTBUG-14467 - ---- qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf.orig 2010-11-16 03:12:17.000000000 +0500 -+++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf 2010-11-16 03:12:50.000000000 +0500 -@@ -62,7 +62,7 @@ defineTest(qtAddLibrary) { - } - isEmpty(LINKAGE) { - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { -- win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d -+ win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX} - mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug - } - isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} ---- qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf.orig 2010-11-16 03:11:34.000000000 +0500 -+++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf 2010-11-16 03:11:51.000000000 +0500 -@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){ - - qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { - isEqual(entryLib, -lqtmain): { -- CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d -+ CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX} - else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} - } else { - QMAKE_LIBS += $${entryLib} diff --git a/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch b/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch deleted file mode 100644 index b675929..0000000 --- a/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri ---- qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing 2011-09-12 01:49:28.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri 2011-11-03 13:04:34.271086323 -0500 -@@ -1,6 +1,8 @@ - HEADERS += $$PWD/qsql_tds.h - SOURCES += $$PWD/qsql_tds.cpp - -+*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing -+ - unix|win32-g++*: { - LIBS *= $$QT_LFLAGS_TDS - !contains(LIBS, .*sybdb.*):LIBS += -lsybdb diff --git a/qt-everywhere-opensource-src-4.8.0-timestamp.patch b/qt-everywhere-opensource-src-4.8.0-timestamp.patch deleted file mode 100644 index 2307353..0000000 --- a/qt-everywhere-opensource-src-4.8.0-timestamp.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp 2012-02-20 15:17:27.343005746 +0100 -@@ -152,8 +152,12 @@ void Ui3Reader::embed(const char *projec - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; -+#else -+ out << "** Created by: " << QT_VERSION_STR << "\n"; -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; - out << "****************************************************************************/\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp 2012-02-20 15:20:13.584706037 +0100 -@@ -146,8 +146,12 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#else -+ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; - out << "********************************************************************************/\n\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp 2012-02-20 15:13:44.175462520 +0100 -@@ -139,8 +139,12 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#else -+ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; - out << "********************************************************************************/\n\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me 2012-02-20 13:22:38.572628193 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp 2012-02-20 14:46:09.981860726 +0100 -@@ -767,8 +767,10 @@ void Moc::parse() - void Moc::generate(FILE *out) - { - -+#ifdef TIMESTAMP - QDateTime dt = QDateTime::currentDateTime(); - QByteArray dstr = dt.toString().toLatin1(); -+#endif - QByteArray fn = filename; - int i = filename.length()-1; - while (i>0 && filename[i-1] != '/' && filename[i-1] != '\\') -@@ -777,8 +779,12 @@ void Moc::generate(FILE *out) - fn = filename.mid(i); - fprintf(out, "/****************************************************************************\n" - "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn); -+#ifdef TIMESTAMP - fprintf(out, "** Created: %s\n" - "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR); -+#else -+ fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR); -+#endif - fprintf(out, "** WARNING! All changes made in this file will be lost!\n" - "*****************************************************************************/\n\n"); - diff --git a/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch b/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch deleted file mode 100644 index fa82334..0000000 --- a/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600 -+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600 -@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv) - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ -+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829 -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/qt-everywhere-opensource-src-4.8.4-QTBUG-29082.patch b/qt-everywhere-opensource-src-4.8.4-QTBUG-29082.patch deleted file mode 100644 index 777d2d9..0000000 --- a/qt-everywhere-opensource-src-4.8.4-QTBUG-29082.patch +++ /dev/null @@ -1,31 +0,0 @@ -Parent: e17dddfd (Make hierarchy of actions in menubars more consistent.) -Author: David E. Narváez -AuthorDate: 2013-02-03 23:07:07 -0500 -Commit: David E. Narváez -CommitDate: 2013-02-09 16:30:41 -0500 - -Fix call to QMetaObject::metaCall from updateProperty - -Create an array of arguments in the same way -QMetaObject::write does - -Task-number: QTBUG-29082 -Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305 -diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp -index dcf779a..9869d7e 100644 ---- a/src/corelib/animation/qpropertyanimation.cpp -+++ b/src/corelib/animation/qpropertyanimation.cpp -@@ -136,8 +136,11 @@ - - if (newValue.userType() == propertyType) { - //no conversion is needed, we directly call the QMetaObject::metacall -- void *data = const_cast(newValue.constData()); -- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); -+ //check QMetaProperty::write for an explanation of these -+ int status = -1; -+ int flags = 0; -+ void *argv[] = { const_cast(newValue.constData()), const_cast(&newValue) , &status, &flags }; -+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); - } else { - targetValue->setProperty(propertyName.constData(), newValue); - } diff --git a/qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch b/qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch deleted file mode 100644 index 1510564..0000000 --- a/qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle.cpp.disable_gtk_theme_check qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle.cpp -diff -up qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp.disable_gtk_theme_check qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp ---- qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp.disable_gtk_theme_check 2012-11-23 04:09:53.000000000 -0600 -+++ qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp 2013-01-04 11:37:22.111481756 -0600 -@@ -503,21 +503,6 @@ void QGtkStylePrivate::initGtkWidgets() - return; - } - -- static QString themeName; -- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { -- themeName = getThemeName(); -- -- if (themeName.isEmpty()) { -- qWarning("QGtkStyle was unable to detect the current GTK+ theme."); -- return; -- } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { -- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4, -- // we cannot support the GTK_Qt Gtk engine -- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine."); -- return; -- } -- } -- - if (QGtkStylePrivate::gtk_init) { - // Gtk will set the Qt error handler so we have to reset it afterwards - x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0); diff --git a/qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch b/qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch new file mode 100644 index 0000000..81d74ff --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch @@ -0,0 +1,24 @@ +diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf +--- qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467 2013-05-30 16:19:17.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf 2013-06-09 11:53:45.709773603 -0500 +@@ -72,7 +72,7 @@ defineTest(qtAddLibrary) { + } + isEmpty(LINKAGE) { + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { +- win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d ++ win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX} + mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug + } + isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} +diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf +--- qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467 2013-05-30 16:19:17.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf 2013-06-09 11:53:45.710773593 -0500 +@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){ + + qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { + isEqual(entryLib, -lqtmain): { +- CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d ++ CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX} + else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} + } else { + QMAKE_LIBS += $${entryLib} diff --git a/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch b/qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch similarity index 72% rename from qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch rename to qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch index 29fc82e..018872f 100644 --- a/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch +++ b/qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch @@ -1,21 +1,7 @@ -From a91e9dd202640598d8dec091c67ec94536390e7f Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -Date: Mon, 17 Oct 2011 17:27:43 -0400 -Subject: [PATCH] Fix logic for figuring out what ConfigureNotify positions - can be trusted - -When reading ahead in the queue for ConfigureNotify events, it's necessary -to look for intermediate ReparentNotify events as well, since they will -determine whether the position in the event can be trusted or not. ---- - src/gui/kernel/qapplication_x11.cpp | 47 ++++++++++++++++++++++++++++++---- - 1 files changed, 41 insertions(+), 6 deletions(-) - -diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp -index 408e9ac..3a1d3eb 100644 ---- a/src/gui/kernel/qapplication_x11.cpp -+++ b/src/gui/kernel/qapplication_x11.cpp -@@ -816,6 +816,27 @@ static Bool qt_sync_request_scanner(Display*, XEvent *event, XPointer arg) +diff -up qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp.QTBUG-21900 qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp +--- qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp.QTBUG-21900 2013-05-30 16:18:05.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp 2013-06-09 11:53:45.891771748 -0500 +@@ -818,6 +818,27 @@ static Bool qt_sync_request_scanner(Disp #endif #endif // QT_NO_XSYNC @@ -43,7 +29,7 @@ index 408e9ac..3a1d3eb 100644 static void qt_x11_create_intern_atoms() { const char *names[QX11Data::NAtoms]; -@@ -5273,8 +5294,11 @@ bool QETWidget::translateConfigEvent(const XEvent *event) +@@ -5302,8 +5323,11 @@ bool QETWidget::translateConfigEvent(con if (d->extra->compress_events) { // ConfigureNotify compression for faster opaque resizing XEvent otherEvent; @@ -57,7 +43,7 @@ index 408e9ac..3a1d3eb 100644 if (qt_x11EventFilter(&otherEvent)) continue; -@@ -5287,13 +5311,19 @@ bool QETWidget::translateConfigEvent(const XEvent *event) +@@ -5316,13 +5340,19 @@ bool QETWidget::translateConfigEvent(con newSize.setWidth(otherEvent.xconfigure.width); newSize.setHeight(otherEvent.xconfigure.height); @@ -78,7 +64,7 @@ index 408e9ac..3a1d3eb 100644 } #ifndef QT_NO_XSYNC qt_sync_request_event_data sync_event; -@@ -5306,9 +5336,14 @@ bool QETWidget::translateConfigEvent(const XEvent *event) +@@ -5335,9 +5365,14 @@ bool QETWidget::translateConfigEvent(con } if (!isCPos) { @@ -96,6 +82,3 @@ index 408e9ac..3a1d3eb 100644 int x, y; Window child; XTranslateCoordinates(X11->display, internalWinId(), --- -1.7.6.4 - diff --git a/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch b/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch new file mode 100644 index 0000000..78b78b0 --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch @@ -0,0 +1,14 @@ +diff -up qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.QTBUG-22829 2013-06-09 17:04:02.762459323 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp 2013-06-09 17:08:20.409680813 -0500 +@@ -188,8 +188,9 @@ int runMoc(int _argc, char **_argv) + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; + +- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 ++ // Workaround a bugs while parsing some boost headers. See QTBUG-22829 + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; ++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; + + QByteArray filename; + QByteArray output; diff --git a/qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch b/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch similarity index 57% rename from qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch rename to qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch index 85fc71a..ee1d191 100644 --- a/qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch +++ b/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch @@ -1,12 +1,10 @@ -diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp ---- qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 2012-09-10 20:36:50.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp 2012-10-22 14:16:42.672111081 -0500 -@@ -611,7 +611,26 @@ bool QFileSystemEngine::setPermissions(c - QString QFileSystemEngine::homePath() +diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp +--- qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 2013-06-09 12:02:50.323221694 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp 2013-06-09 12:38:53.140804742 -0500 +@@ -624,6 +624,25 @@ QString QFileSystemEngine::homePath() { QString home = QFile::decodeName(qgetenv("HOME")); -- if (home.isNull()) -+ if (home.isEmpty()) + if (home.isEmpty()) + { +#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) + int size_max = sysconf(_SC_GETPW_R_SIZE_MAX); @@ -29,4 +27,3 @@ diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_uni home = rootPath(); return QDir::cleanPath(home); } -diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfsfileengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfsfileengine_unix.cpp diff --git a/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch b/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch new file mode 100644 index 0000000..9a9f773 --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch @@ -0,0 +1,22 @@ +diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp +--- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check 2013-06-09 16:28:22.938840346 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp 2013-06-09 17:03:01.781125479 -0500 +@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets() + return; + } + +- static QString themeName; +- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { +- themeName = getThemeName(); +- +- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { +- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4, +- // we cannot support the GTK_Qt Gtk engine +- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine."); +- return; +- } +- } +- + if (QGtkStylePrivate::gtk_init) { + // Gtk will set the Qt error handler so we have to reset it afterwards + x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0); diff --git a/qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch b/qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch new file mode 100644 index 0000000..2deeb51 --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch @@ -0,0 +1,12 @@ +diff -up qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri +--- qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing 2013-06-09 11:57:49.198291245 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri 2013-06-09 12:01:24.120100371 -0500 +@@ -1,6 +1,8 @@ + HEADERS += $$PWD/qsql_tds.h + SOURCES += $$PWD/qsql_tds.cpp + ++*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing ++ + unix|win32-g++*: { + LIBS += $$QT_LFLAGS_TDS + !contains(LIBS, .*sybdb.*):LIBS += -lsybdb diff --git a/qt-everywhere-opensource-src-4.8.5-uic_multilib.patch b/qt-everywhere-opensource-src-4.8.5-uic_multilib.patch new file mode 100644 index 0000000..d04d1be --- /dev/null +++ b/qt-everywhere-opensource-src-4.8.5-uic_multilib.patch @@ -0,0 +1,28 @@ +diff -up qt-everywhere-opensource-src-4.8.5/src/tools/moc/moc.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/moc/moc.cpp +diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp +--- qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp.uic_multilib 2013-05-30 16:18:04.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp 2013-06-09 11:50:25.597813974 -0500 +@@ -152,8 +152,7 @@ void Ui3Reader::embed(const char *projec + for ( it = images.begin(); it != images.end(); ++it ) + out << "** " << *it << "\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; +- out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; ++ out << "** Created: by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; + out << "****************************************************************************/\n"; +diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp +--- qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp.uic_multilib 2013-05-30 16:18:04.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp 2013-06-09 11:51:28.310174526 -0500 +@@ -146,8 +146,7 @@ void Uic::writeCopyrightHeader(DomUI *ui + out << "/********************************************************************************\n"; + out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; +- out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); ++ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; + out << "********************************************************************************/\n\n"; +diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic/uic.cpp diff --git a/qt.spec b/qt.spec index 380e91c..6cd9085 100644 --- a/qt.spec +++ b/qt.spec @@ -16,17 +16,23 @@ # use qtchooser (default off, for now) #define qtchooser 1 +%define pre rc + Summary: Qt toolkit Name: qt Epoch: 1 -Version: 4.8.4 -Release: 19%{?dist} +Version: 4.8.5 +Release: 0.1.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT Group: System Environment/Libraries Url: http://qt-project.org/ +%if 0%{?pre:1} +Source0: http://download.qt-project.org/snapshots/qt/4.8/%{version}-%{pre}/qt-everywhere-opensource-src-%{version}-RC.tar.gz +%else Source0: http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}.tar.gz +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: qt4 < %{version}-%{release} @@ -43,7 +49,7 @@ Source5: qconfig-multilib.h Patch2: qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch # get rid of timestamp which causes multilib problem -Patch4: qt-everywhere-opensource-src-4.8.0-timestamp.patch +Patch4: qt-everywhere-opensource-src-4.8.5-uic_multilib.patch # enable ft lcdfilter Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch @@ -77,7 +83,7 @@ Patch54: qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch # Fails to create debug build of Qt projects on mingw (rhbz#653674) -Patch64: qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch +Patch64: qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch # fix QTreeView crash triggered by KPackageKit (patch by David Faure) Patch65: qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch @@ -93,11 +99,11 @@ Patch68: qt-everywhere-opensource-src-4.8.3-no_Werror.patch Patch69: qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch # Buttons in Qt applications not clickable when run under gnome-shell (#742658, QTBUG-21900) -Patch71: qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch +Patch71: qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch # workaround # sql/drivers/tds/qsql_tds.cpp:341:49: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] -Patch74: qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch +Patch74: qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch # add missing method for QBasicAtomicPointer on s390(x) Patch76: qt-everywhere-opensource-src-4.8.0-s390-atomic.patch @@ -115,7 +121,7 @@ Patch81: qt-everywhere-opensource-src-4.8.2--assistant-crash.patch # https://bugs.kde.org/show_bug.cgi?id=249217 # https://bugreports.qt-project.org/browse/QTBUG-4862 # QDir::homePath() should account for an empty HOME environment variable on X11 -Patch82: qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch +Patch82: qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch # poll support Patch83: qt-4.8-poll.patch @@ -123,41 +129,20 @@ Patch83: qt-4.8-poll.patch # upstream patches # http://codereview.qt-project.org/#change,22006 Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch -# https://bugreports.qt-project.org/browse/QTBUG-29082 -Patch101: qt-everywhere-opensource-src-4.8.4-QTBUG-29082.patch # backported from Qt5 (essentially) # http://bugzilla.redhat.com/702493 # https://bugreports.qt-project.org/browse/QTBUG-5545 -Patch102: qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch -# workaround for MOC issues with Boost headers (#756395,QTBUG-22829) -Patch113: qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch -# QSslSocket may report incorrect errors when certificate verification fails -# https://codereview.qt-project.org/#change,42461 -Patch154: 0054-Fix-binary-incompatibility-between-openssl-versions.patch +Patch102: qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch +# workaround for MOC issues with Boost headers (#756395) +# https://bugreports.qt-project.org/browse/QTBUG-22829 +Patch113: qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch # https://codereview.qt-project.org/#change,55874 # REVERT, causes regressions http://bugzilla.redhat.com/968794 #Patch155: qt-everywhere-opensource-src-4.8-QTBUG-27809.patch ## upstream git -# QSslSocket may report incorrect errors when certificate verification fails -# https://codereview.qt-project.org/#change,42461 -Patch254: 0054-Fix-binary-incompatibility-between-openssl-versions.patch -Patch257: 0057-Update-defaultNumberingSystem-value-for-some-indic-a.patch -Patch267: 0067-Allow-qmljsdebugger-argument-and-value-to-be-separat.patch -# http://lists.qt-project.org/pipermail/announce/2013-January/000021.html -Patch280: 0080-SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch -# another set similar to 0080 -Patch290: 0090-QtNetwork-blacklist-two-more-certificates.patch -Patch310: 0110-QUrl-fromUserInput-fix-for-urls-without-a-host.patch -Patch312: 0112-Limit-the-range-of-the-QUrlPrivate-port-to-1-to-6553.patch -Patch324: 0124-QtDBus-Garbage-collect-deleted-objects-now-and-then.patch -Patch325: 0125-QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch -Patch414: 0214-Fix-multiselection-by-CTRL-click-in-QFileDialog-KDE.patch # security patches -# CVE-2011-3922 qt: Stack-based buffer overflow in embedded harfbuzz code -Patch500: qt-4.8.0-CVE-2011-3922-bz#772125.patch -Patch501: qt-4.8-CVE-2013-0254.patch # desktop files Source20: assistant.desktop @@ -234,10 +219,9 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) BuildRequires: rsync -## In theory, should be as simple as: -#define x_deps libGL-devel libGLU-devel -## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 -%define x_deps pkgconfig(ice) pkgconfig(sm) pkgconfig(xcursor) pkgconfig(xext) pkgconfig(xfixes) pkgconfig(xft) pkgconfig(xi) pkgconfig(xinerama) pkgconfig(xrandr) pkgconfig(xrender) pkgconfig(xt) pkgconfig(xv) pkgconfig(x11) pkgconfig(xproto) pkgconfig(gl) pkgconfig(glu) +%define gl_deps pkgconfig(gl) pkgconfig(glu) +%define x_deps pkgconfig(ice) pkgconfig(sm) pkgconfig(xcursor) pkgconfig(xext) pkgconfig(xfixes) pkgconfig(xft) pkgconfig(xi) pkgconfig(xinerama) pkgconfig(xrandr) pkgconfig(xrender) pkgconfig(xt) pkgconfig(xv) pkgconfig(x11) pkgconfig(xproto) +BuildRequires: %{gl_deps} BuildRequires: %{x_deps} %if "%{?ibase}" != "-no-sql-ibase" @@ -351,6 +335,7 @@ Group: Development/Libraries Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-x11%{?_isa} Requires: %{name}-sqlite%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{gl_deps} Requires: %{x_deps} Requires: pkgconfig %if 0%{?phonon:1} @@ -499,24 +484,11 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags # upstream patches %patch100 -p1 -b .QTgaHandler -%patch101 -p1 -b .QTBUG-29082 %patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check %patch113 -p1 -b .QTBUG-22829 #patch155 -p1 -b .QTBUG-27809 -%patch254 -p1 -b .0054 -%patch257 -p1 -b .0057 -%patch267 -p1 -b .0067 -%patch280 -p1 -b .0080 -%patch290 -p1 -b .0090 -%patch310 -p1 -b .0110 -%patch312 -p1 -b .0112 -%patch324 -p1 -b .0124 -%patch325 -p1 -b .0125 -%patch414 -p1 -b .0214 # security fixes -%patch500 -p1 -b .CVE-2011-3922 -%patch501 -p1 -b .qsharedmemory-security # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -1186,6 +1158,9 @@ fi %changelog +* Sun Jun 09 2013 Rex Dieter 4.8.5-0.1.rc +- 4.8.5-RC + * Thu May 30 2013 Rex Dieter 4.8.4-19 - drop QTBUG-27809 candidate fix, causes regressions (#968794) diff --git a/sources b/sources index a82496b..9ea2ad7 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png -6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png -89c5ecba180cae74c66260ac732dc5cb qt-everywhere-opensource-src-4.8.4.tar.gz +bd864e90212a6c5cdaf24d865a64d240 qt-everywhere-opensource-src-4.8.5-RC.tar.gz