1

Topic: deprecated fix patch files for Qt5.15

Sorry I'm back with some patches this time for Qt5.15
This is part 1.

Post's attachments

Attachment icon patch_to_qt_5_15.zip 7.58 kb, 8 downloads since 2020-06-11 

2

Re: deprecated fix patch files for Qt5.15

Merged, thanks Simon.
https://git.tuxfamily.org/qet/qet.git/c … 1cdec1f1b2

3

Re: deprecated fix patch files for Qt5.15

This is part 2
and proposal to make the Copyright Date dynamic (separate patch)

Post's attachments

Attachment icon patch2.zip 5.21 kb, 8 downloads since 2020-06-12 

4 (edited by De-Backer 2020-06-12 20:24:58)

Re: deprecated fix patch files for Qt5.15

for the next warning:

sources/genericpanel.cpp: In member function ‘virtual void GenericPanel::projectInformationsChanged(QETProject*)’:
sources/genericpanel.cpp:533:38: warning: ‘constexpr QFlags<T>::QFlags(QFlags<T>::Zero) [with Enum = GenericPanel::PanelOption; QFlags<T>::Zero = int QFlags<GenericPanel::PanelOption>::Private::*]’ is deprecated: Use default constructor instead [-Wdeprecated-declarations]
  533 |  addProject(project, nullptr, nullptr);
      |                                      ^
In file included from /usr/include/qt5/QtCore/qglobal.h:1302,
                 from /usr/include/qt5/QtXml/qtxmlglobal.h:43,
                 from /usr/include/qt5/QtXml/qdom.h:43,
                 from /usr/include/qt5/QtXml/QDomElement:1,
                 from sources/qet.h:21,
                 from sources/genericpanel.h:20,
                 from sources/genericpanel.cpp:18:
/usr/include/qt5/QtCore/qflags.h:123:80: note: declared here
  123 |     QT_DEPRECATED_X("Use default constructor instead") Q_DECL_CONSTEXPR inline QFlags(Zero) noexcept : i(0) {}
      |                                                                                ^~~~~~

I would like to know the default constructor in file "sources/genericpanel.h"

    enum PanelOption {
        AddChildDiagrams              =   1,
        AddChildTemplatesCollection   =   2,
        AddChildTemplates             =   4,
        AddAllChildTemplates          =   6,
        AddAllChild                   =  63,
        All                           = 127
    };
    Q_DECLARE_FLAGS(PanelOptions, PanelOption)

and if there is an extra enum, what should it be and what checks should be.

AddAllChild ?

5

Re: deprecated fix patch files for Qt5.15

Application de  fix deprecated warning QTextStream& QTextStreamFunctions::endl(QTextStream&)
error: le patch a échoué : sources/nomenclature.cpp:66
error: sources/nomenclature.cpp : le patch ne s'applique pas
le patch a échoué à 0001 fix deprecated warning QTextStream& QTextStreamFunctions::endl(QTextStream&)

6

Re: deprecated fix patch files for Qt5.15

scorpio810 wrote:
Application de  fix deprecated warning QTextStream& QTextStreamFunctions::endl(QTextStream&)
error: le patch a échoué : sources/nomenclature.cpp:66
error: sources/nomenclature.cpp : le patch ne s'applique pas
le patch a échoué à 0001 fix deprecated warning QTextStream& QTextStreamFunctions::endl(QTextStream&)

Qt version?

7

Re: deprecated fix patch files for Qt5.15

update

Post's attachments

Attachment icon 0001-fix-deprecated-warning-QTextStream-QTextStreamFuncti.patch 2.13 kb, 11 downloads since 2020-06-12 

8

Re: deprecated fix patch files for Qt5.15

De-Backer wrote:

update

or
simple but no buffer flush

Post's attachments

Attachment icon 0001-fix-deprecated-warning-QTextStream-QTextStreamFuncti.patch 1.82 kb, 14 downloads since 2020-06-12 

9

Re: deprecated fix patch files for Qt5.15

Fixed, but I don't understand why git am can't apply sources/nomenclature.cpp:66, not tried git apply..
Maybe :
https://stackoverflow.com/questions/241 … introduced

10

Re: deprecated fix patch files for Qt5.15

a 6 patch's

Post's attachments

Attachment icon 20200621patch.zip 1017.53 kb, 7 downloads since 2020-06-21 

11

Re: deprecated fix patch files for Qt5.15

LANG="C" git am --3way 0001-fix-tr-cannot-be-called-without-context.patch
Applying: fix tr() cannot be called without context
Using index info to reconstruct a base tree...
M       lang/qet_da.qm
M       lang/qet_da.ts
.git/rebase-apply/patch:24940: trailing whitespace.
        <source>Veuillez choisir un potentiel électrique de la liste
.git/rebase-apply/patch:25574: trailing whitespace.
Options disponibles :
.git/rebase-apply/patch:26635: trailing whitespace.
Put DXFtoQET.exe binary on C:\Users\user_name\AppData\Roaming\qet\ directory
.git/rebase-apply/patch:26645: trailing whitespace.
Put DXFtoQET.app binary on /Users/user_name/.qet/ directory
.git/rebase-apply/patch:27037: trailing whitespace.
Put DXFtoQET.exe binary on C:\Users\user_name\AppData\Roaming\qet\ directory
warning: squelched 20 whitespace errors
warning: 25 lines add whitespace errors.
Falling back to patching base and 3-way merge...
warning: Cannot merge binary files: lang/qet_da.qm (HEAD vs. fix tr() cannot be called without context)
Auto-merging lang/qet_da.ts
Auto-merging lang/qet_da.qm
CONFLICT (content): Merge conflict in lang/qet_da.qm
error: Failed to merge in the changes.
Patch failed at 0001 fix tr() cannot be called without context

Ok Danish translation commit pushed in the same time
https://git.tuxfamily.org/qet/qet.git/c … 4d3fcb8898


0001-fix-Wdeprecated-declarations-QProcess-startDetached.patch can't launch detached plugin.

12

Re: deprecated fix patch files for Qt5.15

fix

Post's attachments

Attachment icon 0001-fix-tr-cannot-be-called-without-context.patch 1.96 kb, 8 downloads since 2020-06-21 

13

Re: deprecated fix patch files for Qt5.15

Great.

[11:22:36] laurent@debian:~/Qet-svn/git/qet$ git am 0001-fix-tr-cannot-be-called-without-context.patch
Application de  fix tr() cannot be called without context
[11:22:44] laurent@debian:~/Qet-svn/git/qet$ sed -i 's/^TRANSLATIONS/#TRANSLATIONS/g' qelectrotech.pro
[11:23:25] laurent@debian:~/Qet-svn/git/qet$ lupdate -noobsolete qelectrotech.pro -ts lang/qet_{en,es,ru,pt,cs,pl,ca,de,ro,it,ar,sl,hr,el,nl,be,sl,zh,hu,pt_br,da,sr,fr,tr,sk,nb,mn}.ts
Info: creating stash file /home/laurent/Qet-svn/git/qet/.qmake.stash
Updating 'lang/qet_en.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 11 translation(s)
Updating 'lang/qet_es.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 8 translation(s)
Updating 'lang/qet_ru.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 6 translation(s)
Updating 'lang/qet_pt.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 3 translation(s)
Updating 'lang/qet_cs.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 11 translation(s)
Updating 'lang/qet_pl.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 10 translation(s)
Updating 'lang/qet_ca.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 6 translation(s)
Updating 'lang/qet_de.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 7 translation(s)
Updating 'lang/qet_ro.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 4 translation(s)
Updating 'lang/qet_it.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 8 translation(s)
Updating 'lang/qet_ar.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 7 translation(s)
Updating 'lang/qet_sl.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
Updating 'lang/qet_hr.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 1 translation(s)
Updating 'lang/qet_el.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 12 translation(s)
Updating 'lang/qet_nl.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 7 translation(s)
Updating 'lang/qet_be.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 12 translation(s)
Updating 'lang/qet_sl.ts'...
    Found 2313 source text(s) (0 new and 2313 already existing)
Updating 'lang/qet_zh.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
Updating 'lang/qet_hu.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 10 translation(s)
Updating 'lang/qet_pt_br.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 11 translation(s)
Updating 'lang/qet_da.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 10 translation(s)
Updating 'lang/qet_sr.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
Updating 'lang/qet_fr.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 3 translation(s)
Updating 'lang/qet_tr.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 8 translation(s)
Updating 'lang/qet_sk.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
Updating 'lang/qet_nb.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
    Same-text heuristic provided 7 translation(s)
Updating 'lang/qet_mn.ts'...
    Found 2313 source text(s) (14 new and 2299 already existing)
    Removed 6 obsolete entries
[11:23:32] laurent@debian:~/Qet-svn/git/qet$ sed -i 's/^#TRANSLATIONS/TRANSLATIONS/g' qelectrotech.pro
[11:23:43] laurent@debian:~/Qet-svn/git/qet$ git add lang/
[11:23:51] laurent@debian:~/Qet-svn/git/qet$ git commit -v
[master edb5217b3] Update *TS files
26 files changed, 8092 insertions(+), 6919 deletions(-)
[11:24:14] laurent@debian:~/Qet-svn/git/qet$ git push

14

Re: deprecated fix patch files for Qt5.15

conductorpropertieswidget.ui

Was not perfect yet if you increase the geometry widget in height, the text alignment became oval.

Post's attachments

Attachment icon 0001-add-Vertical-sparcer-s.patch 12.25 kb, 6 downloads since 2020-06-21 

15

Re: deprecated fix patch files for Qt5.15

Merged, thanks Simon.