diff --git a/cmake/kf5i18nuic.cmake b/cmake/kf5i18nuic.cmake --- a/cmake/kf5i18nuic.cmake +++ b/cmake/kf5i18nuic.cmake @@ -35,9 +35,9 @@ IF (_uic_CONTENTS) - #replace tr218n("") with QString::null to avoid warning from KLocale - STRING(REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" ) - STRING(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" ) + #replace tr218n("") with QString() to avoid warning from KLocale + STRING(REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString\\(\\)" _uic_CONTENTS "${_uic_CONTENTS}" ) + STRING(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString\\(\\)" _uic_CONTENTS "${_uic_CONTENTS}" ) #replace image15_data with img15_filename to make enable_final work STRING(REGEX REPLACE "image([0-9]+)_data" "img\\1_${KDE_UIC_BASENAME}" _uic_CONTENTS "${_uic_CONTENTS}") #fixup include guard diff --git a/docs/programmers-guide.md b/docs/programmers-guide.md --- a/docs/programmers-guide.md +++ b/docs/programmers-guide.md @@ -1170,8 +1170,8 @@ uifile=fooconfpage.ui uihfile=$uifile.h uic -tr tr2i18n $uifile -o $uihfile -sed -i 's/tr2i18n("")/QString::null/g' $uihfile -sed -i 's/tr2i18n("", "")/QString::null/g' $uihfile +sed -i 's/tr2i18n("")/QString()/g' $uihfile +sed -i 's/tr2i18n("", "")/QString()/g' $uihfile sed -i "1i\#define TRANSLATION_DOMAIN \"$domain\"\n#include " $uihfile ~~~