Author: svn-role Date: Thu Jan 28 04:00:07 2021 New Revision: 1885962 URL: http://svn.apache.org/viewvc?rev=1885962&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, hartmannathan Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp Propchange: subversion/branches/1.10.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1875680 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885962&r1=1885961&r2=1885962&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jan 28 04:00:07 2021 @@ -49,13 +49,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, hartmannathan - * r1875726 Error out if generating SWIG-related files fails in autogen.sh --release Justification: Modified: subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1885962&r1=1885961&r2=1885962&view=diff ============================================================================== --- subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp (original) +++ subversion/branches/1.10.x/subversion/libsvn_auth_kwallet/kwallet.cpp Thu Jan 28 04:00:07 2021 @@ -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,