Author: svn-role
Date: Wed Apr 8 04:00:12 2020
New Revision: 1876259
URL: http://svn.apache.org/viewvc?rev=1876259&view=rev
Log:
Merge r1875680 from trunk:
* r1875680
Construct KAboutData using QString rather than QStringLiteral
Justification:
Fixes a crash seen when using git-svn with kwallet
Votes:
+1: jamessan, stsp, cmpilato
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_auth_kwallet/kwallet.cpp
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1875680
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876259&r1=1876258&r2=1876259&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Apr 8 04:00:12 2020
@@ -21,13 +21,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1875680
- Construct KAboutData using QString rather than QStringLiteral
- Justification:
- Fixes a crash seen when using git-svn with kwallet
- Votes:
- +1: jamessan, stsp, cmpilato
-
* r1875726
Error out if generating SWIG-related files fails in autogen.sh --release
Justification:
@@ -88,4 +81,3 @@ Approved changes:
Fix shelf-cmd/shelf2-cmd link errors for svn on Windows
Votes:
+1: jamessan, stsp, jcorvel
-
Modified: subversion/branches/1.14.x/subversion/libsvn_auth_kwallet/kwallet.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1876259&r1=1876258&r2=1876259&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_auth_kwallet/kwallet.cpp
(original)
+++ subversion/branches/1.14.x/subversion/libsvn_auth_kwallet/kwallet.cpp Wed
Apr 8 04:00:12 2020
@@ -227,10 +227,10 @@ kwallet_password_get(svn_boolean_t *done
KLocalizedString::setApplicationDomain("subversion"); /* translation domain
*/
/* componentName appears in KDE GUI prompts */
- KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
+ KAboutData aboutData(QString("subversion"), /* componentName */
i18n(get_application_name(parameters,
pool)), /* displayName */
- QStringLiteral(SVN_VER_NUMBER));
+ QString(SVN_VER_NUMBER));
KAboutData::setApplicationData(aboutData);
#else
KCmdLineArgs::init(q_argc, q_argv,
@@ -309,10 +309,10 @@ kwallet_password_set(svn_boolean_t *done
KLocalizedString::setApplicationDomain("subversion"); /* translation domain
*/
/* componentName appears in KDE GUI prompts */
- KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
+ KAboutData aboutData(QString("subversion"), /* componentName */
i18n(get_application_name(parameters,
pool)), /* displayName */
- QStringLiteral(SVN_VER_NUMBER));
+ QString(SVN_VER_NUMBER));
KAboutData::setApplicationData(aboutData);
#else
KCmdLineArgs::init(q_argc, q_argv,
