Hello community, here is the log from the commit of package qt5ct for openSUSE:Factory checked in at 2020-07-17 20:54:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt5ct (Old) and /work/SRC/openSUSE:Factory/.qt5ct.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt5ct" Fri Jul 17 20:54:07 2020 rev:17 rq:821530 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt5ct/qt5ct.changes 2019-12-07 15:10:59.623833182 +0100 +++ /work/SRC/openSUSE:Factory/.qt5ct.new.3592/qt5ct.changes 2020-07-17 20:54:48.601168118 +0200 @@ -1,0 +2,9 @@ +Fri Jul 17 06:28:11 UTC 2020 - Fabian Vogt <[email protected]> + +- Update to 1.0: + * added Ia Ora color scheme (from Mandriva default style) + * disabled debug messages by default + * fixed Qt 5.15 palette + * fixed crash on certain applications under Qt 5.15 (boo#1174224) + +------------------------------------------------------------------- Old: ---- qt5ct-0.41.tar.bz2 New: ---- qt5ct-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt5ct.spec ++++++ --- /var/tmp/diff_new_pack.R8o90H/_old 2020-07-17 20:54:49.609169170 +0200 +++ /var/tmp/diff_new_pack.R8o90H/_new 2020-07-17 20:54:49.613169174 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt5ct # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: qt5ct -Version: 0.41 +Version: 1.0 Release: 0 Summary: Qt5 Configuration Tool License: BSD-2-Clause @@ -45,7 +45,7 @@ font, icons, etc.) under DE/WM without Qt integration. %prep -%setup -q +%autosetup -p1 %build %qmake5 ++++++ qt5ct-0.41.tar.bz2 -> qt5ct-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/COPYING new/qt5ct-1.0/COPYING --- old/qt5ct-0.41/COPYING 2019-09-04 21:52:46.000000000 +0200 +++ new/qt5ct-1.0/COPYING 2020-06-10 17:29:11.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2014-2019, Ilya Kotov <[email protected]> +Copyright (c) 2014-2020, Ilya Kotov <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/ChangeLog new/qt5ct-1.0/ChangeLog --- old/qt5ct-0.41/ChangeLog 2019-09-04 21:52:46.000000000 +0200 +++ new/qt5ct-1.0/ChangeLog 2020-06-10 17:29:11.000000000 +0200 @@ -325,3 +325,9 @@ Version 0.41 * fixed crash on icon theme search (regression since 0.40) + +Version 1.0 +* added Ia Ora color scheme (from Mandriva default style) +* disabled debug messages by default +* fixed Qt 5.15 palette +* fixed crash on certain applications under Qt 5.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/ChangeLog.svn new/qt5ct-1.0/ChangeLog.svn --- old/qt5ct-0.41/ChangeLog.svn 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/ChangeLog.svn 2020-06-10 17:29:11.000000000 +0200 @@ -1,4 +1,65 @@ ------------------------------------------------------------------------ +r572 | trialuser02 | 2020-06-06 17:11:41 +0300 (Сб, 06 июн 2020) | 1 line + +updated changelog +------------------------------------------------------------------------ +r571 | trialuser02 | 2020-06-06 17:03:38 +0300 (Сб, 06 июн 2020) | 2 lines + +version bump + +------------------------------------------------------------------------ +r570 | trialuser02 | 2020-06-04 21:39:03 +0300 (Чт, 04 июн 2020) | 3 lines + +fixed support of krita and other applications with custom color schemes +(#77) + +------------------------------------------------------------------------ +r569 | trialuser02 | 2020-05-30 19:50:15 +0300 (Сб, 30 мая 2020) | 1 line + +fixed test.sh +------------------------------------------------------------------------ +r568 | trialuser02 | 2020-05-30 19:46:43 +0300 (Сб, 30 мая 2020) | 2 lines + +fixed README + +------------------------------------------------------------------------ +r567 | trialuser02 | 2020-05-30 19:42:45 +0300 (Сб, 30 мая 2020) | 2 lines + +disabled debug messages by default (#72) + +------------------------------------------------------------------------ +r566 | trialuser02 | 2020-05-30 19:06:50 +0300 (Сб, 30 мая 2020) | 2 lines + +added ia ora color scheme + +------------------------------------------------------------------------ +r565 | trialuser02 | 2020-05-30 17:54:06 +0300 (Сб, 30 мая 2020) | 2 lines + +code style fixes + +------------------------------------------------------------------------ +r564 | trialuser02 | 2020-05-30 12:15:12 +0300 (Сб, 30 мая 2020) | 2 lines + +fixed Qt 5.15 palette + +------------------------------------------------------------------------ +r563 | trialuser02 | 2020-05-17 22:27:49 +0300 (Вс, 17 мая 2020) | 2 lines + +updated copyright + +------------------------------------------------------------------------ +r562 | trialuser02 | 2020-04-18 18:02:23 +0300 (Сб, 18 апр 2020) | 1 line + +updated Turkish translation (Yaşar Çiv) +------------------------------------------------------------------------ +r561 | trialuser02 | 2019-12-15 23:40:05 +0300 (Вс, 15 дек 2019) | 1 line + +fixed qt 5.15 warnings +------------------------------------------------------------------------ +r560 | trialuser02 | 2019-09-04 22:54:57 +0300 (Ср, 04 сен 2019) | 1 line + +version bump +------------------------------------------------------------------------ r558 | trialuser02 | 2019-09-04 22:48:29 +0300 (Ср, 04 сен 2019) | 1 line updated changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/README new/qt5ct-1.0/README --- old/qt5ct-0.41/README 2019-09-04 21:52:46.000000000 +0200 +++ new/qt5ct-1.0/README 2020-06-10 17:29:11.000000000 +0200 @@ -41,10 +41,10 @@ Debug Messages: -By default, platform plugin prints debug information to stderr. To disable this behaviour, you should +By default, debug messages from platform plugin are disabled. To enable them, you should export the following environment variable: -export QT_LOGGING_RULES="qt5ct.debug=false" +export QT_LOGGING_RULES="qt5ct.debug=true" Another way is to change qtlogging.ini file. See Qt documentation for details: https://doc.qt.io/qt-5/qloggingcategory.html (paragraph "Configuring Categories") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/colors/ia_ora.conf new/qt5ct-1.0/colors/ia_ora.conf --- old/qt5ct-0.41/colors/ia_ora.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/qt5ct-1.0/colors/ia_ora.conf 2020-06-10 17:29:11.000000000 +0200 @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ff000000, #ffeff3f7, #ffffffff, #ffe9e7e3, #ffc7cbce, #ffa0a0a4, #ff000000, #ffffffff, #ff000000, #ffeff3f7, #ffeff3f7, #ffb8bbbe, #ff4965ae, #ffffffff, #ff0000ff, #ffff00ff, #ffeff3f7, #ff000000, #ffffffdc, #ff000000, #80000000 +disabled_colors=#ff808080, #ffeff3f7, #ffffffff, #ffe9e7e3, #ffc7cbce, #ffa0a0a4, #ff808080, #ffffffff, #ff808080, #ffeff3f7, #ffeff3f7, #ffb8bbbe, #ff4965ae, #ff808080, #ff0000ff, #ffff00ff, #ffeff3f7, #ff000000, #ffffffdc, #ff000000, #80000000 +inactive_colors=#ff000000, #ffeff3f7, #ffffffff, #ffe9e7e3, #ffc7cbce, #ffa0a0a4, #ff000000, #ffffffff, #ff000000, #ffeff3f7, #ffeff3f7, #ffb8bbbe, #ff4965ae, #ffffffff, #ff0000ff, #ffff00ff, #ffeff3f7, #ff000000, #ffffffdc, #ff000000, #80000000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/appearancepage.cpp new/qt5ct-1.0/src/qt5ct/appearancepage.cpp --- old/qt5ct-0.41/src/qt5ct/appearancepage.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/appearancepage.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/appearancepage.h new/qt5ct-1.0/src/qt5ct/appearancepage.h --- old/qt5ct-0.41/src/qt5ct/appearancepage.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/appearancepage.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/fontconfigdialog.cpp new/qt5ct-1.0/src/qt5ct/fontconfigdialog.cpp --- old/qt5ct-0.41/src/qt5ct/fontconfigdialog.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/fontconfigdialog.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/fontconfigdialog.h new/qt5ct-1.0/src/qt5ct/fontconfigdialog.h --- old/qt5ct-0.41/src/qt5ct/fontconfigdialog.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/fontconfigdialog.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/fontspage.cpp new/qt5ct-1.0/src/qt5ct/fontspage.cpp --- old/qt5ct-0.41/src/qt5ct/fontspage.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/fontspage.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/fontspage.h new/qt5ct-1.0/src/qt5ct/fontspage.h --- old/qt5ct-0.41/src/qt5ct/fontspage.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/fontspage.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/iconthemepage.cpp new/qt5ct-1.0/src/qt5ct/iconthemepage.cpp --- old/qt5ct-0.41/src/qt5ct/iconthemepage.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/iconthemepage.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/iconthemepage.h new/qt5ct-1.0/src/qt5ct/iconthemepage.h --- old/qt5ct-0.41/src/qt5ct/iconthemepage.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/iconthemepage.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/interfacepage.cpp new/qt5ct-1.0/src/qt5ct/interfacepage.cpp --- old/qt5ct-0.41/src/qt5ct/interfacepage.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/interfacepage.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/interfacepage.h new/qt5ct-1.0/src/qt5ct/interfacepage.h --- old/qt5ct-0.41/src/qt5ct/interfacepage.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/interfacepage.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/main.cpp new/qt5ct-1.0/src/qt5ct/main.cpp --- old/qt5ct-0.41/src/qt5ct/main.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/main.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/mainwindow.cpp new/qt5ct-1.0/src/qt5ct/mainwindow.cpp --- old/qt5ct-0.41/src/qt5ct/mainwindow.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/mainwindow.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/mainwindow.h new/qt5ct-1.0/src/qt5ct/mainwindow.h --- old/qt5ct-0.41/src/qt5ct/mainwindow.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/mainwindow.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/paletteeditdialog.cpp new/qt5ct-1.0/src/qt5ct/paletteeditdialog.cpp --- old/qt5ct-0.41/src/qt5ct/paletteeditdialog.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/paletteeditdialog.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/paletteeditdialog.h new/qt5ct-1.0/src/qt5ct/paletteeditdialog.h --- old/qt5ct-0.41/src/qt5ct/paletteeditdialog.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/paletteeditdialog.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/qsseditordialog.cpp new/qt5ct-1.0/src/qt5ct/qsseditordialog.cpp --- old/qt5ct-0.41/src/qt5ct/qsseditordialog.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/qsseditordialog.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/qsseditordialog.h new/qt5ct-1.0/src/qt5ct/qsseditordialog.h --- old/qt5ct-0.41/src/qt5ct/qsseditordialog.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/qsseditordialog.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/qsspage.cpp new/qt5ct-1.0/src/qt5ct/qsspage.cpp --- old/qt5ct-0.41/src/qt5ct/qsspage.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/qsspage.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/qsspage.h new/qt5ct-1.0/src/qt5ct/qsspage.h --- old/qt5ct-0.41/src/qt5ct/qsspage.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/qsspage.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/qt5ct.cpp new/qt5ct-1.0/src/qt5ct/qt5ct.cpp --- old/qt5ct-0.41/src/qt5ct/qt5ct.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/qt5ct.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/qt5ct.desktop new/qt5ct-1.0/src/qt5ct/qt5ct.desktop --- old/qt5ct-0.41/src/qt5ct/qt5ct.desktop 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/qt5ct.desktop 2020-06-10 17:29:11.000000000 +0200 @@ -55,6 +55,9 @@ Comment[sr]=Qt5 конфигурациони алат Name[sr]=Qt5 поставке +Comment[tr]=Qt5 Yapılandırma Aracı +Name[tr]=Qt5 Ayarları + Comment[zh_CN]=Qt5 配置工具 Name[zh_CN]=Qt5 设置 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/qt5ct.h new/qt5ct-1.0/src/qt5ct/qt5ct.h --- old/qt5ct-0.41/src/qt5ct/qt5ct.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/qt5ct.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -29,8 +29,8 @@ #ifndef QT5CT_H #define QT5CT_H -#define QT5CT_VERSION_MAJOR 0 -#define QT5CT_VERSION_MINOR 41 +#define QT5CT_VERSION_MAJOR 1 +#define QT5CT_VERSION_MINOR 0 #define QT5CT_TOSTRING(s) #s #define QT5CT_STRINGIFY(s) QT5CT_TOSTRING(s) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/tabpage.cpp new/qt5ct-1.0/src/qt5ct/tabpage.cpp --- old/qt5ct-0.41/src/qt5ct/tabpage.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/tabpage.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct/tabpage.h new/qt5ct-1.0/src/qt5ct/tabpage.h --- old/qt5ct-0.41/src/qt5ct/tabpage.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct/tabpage.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct-qtplugin/main.cpp new/qt5ct-1.0/src/qt5ct-qtplugin/main.cpp --- old/qt5ct-0.41/src/qt5ct-qtplugin/main.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct-qtplugin/main.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp new/qt5ct-1.0/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp --- old/qt5ct-0.41/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -34,7 +34,7 @@ #include <QPalette> #include <QTimer> #include <QIcon> -#include <QRegExp> +#include <QRegularExpression> #include <QMimeDatabase> #ifdef QT_WIDGETS_LIB #include <QStyle> @@ -59,7 +59,7 @@ #include <qpa/qplatformthemefactory_p.h> #endif -Q_LOGGING_CATEGORY(lqt5ct, "qt5ct") +Q_LOGGING_CATEGORY(lqt5ct, "qt5ct", QtWarningMsg) //QT_QPA_PLATFORMTHEME=qt5ct @@ -84,8 +84,8 @@ Qt5CTPlatformTheme::~Qt5CTPlatformTheme() { - if(m_customPalette) - delete m_customPalette; + if(m_palette) + delete m_palette; } @@ -133,8 +133,7 @@ const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const { - Q_UNUSED(type); - return (m_usePalette ? m_customPalette : nullptr); + return (m_usePalette && m_palette) ? m_palette : QPlatformTheme::palette(type); } const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const @@ -226,13 +225,12 @@ if(m_update && qApp->style()->objectName() == "qt5ct-style") //ignore application style qApp->setStyle("qt5ct-style"); //recreate style object + if(!m_palette) + m_palette = new QPalette(qApp->style()->standardPalette()); + if(m_update && m_usePalette) - { - if(m_customPalette) - qApp->setPalette(*m_customPalette); - else - qApp->setPalette(qApp->style()->standardPalette()); - } + qApp->setPalette(*m_palette); + //do not override application style if(m_prevStyleSheet == qApp->styleSheet()) @@ -244,12 +242,12 @@ #endif QGuiApplication::setFont(m_generalFont); //apply font QIcon::setThemeName(m_iconTheme); //apply icons - if(m_customPalette && m_usePalette) - QGuiApplication::setPalette(*m_customPalette); //apply palette + if(m_palette && m_usePalette) + QGuiApplication::setPalette(*m_palette); //apply palette #ifdef QT_WIDGETS_LIB - if(m_customPalette && m_usePalette && !m_update) - qApp->setPalette(*m_customPalette); + if(m_palette && m_usePalette && !m_update) + qApp->setPalette(*m_palette); if(hasWidgets()) { @@ -261,8 +259,7 @@ } #endif - if(!m_update) - m_update = true; + m_update = true; } #ifdef QT_WIDGETS_LIB @@ -288,10 +285,10 @@ void Qt5CTPlatformTheme::readSettings() { - if(m_customPalette) + if(m_palette) { - delete m_customPalette; - m_customPalette = nullptr; + delete m_palette; + m_palette = nullptr; } QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); @@ -302,7 +299,7 @@ if(!schemePath.isEmpty() && settings.value("custom_palette", false).toBool()) { schemePath = Qt5CT::resolvePath(schemePath); //replace environment variables - m_customPalette = new QPalette(loadColorScheme(schemePath)); + m_palette = new QPalette(loadColorScheme(schemePath)); } m_iconTheme = settings.value("icon_theme").toString(); //load dialogs @@ -399,8 +396,7 @@ file.open(QIODevice::ReadOnly); content.append(QString::fromUtf8(file.readAll())); } - QRegExp regExp("//.*(\\n|$)"); - regExp.setMinimal(true); + QRegularExpression regExp("//.*(\\n|$)"); content.remove(regExp); return content; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct-qtplugin/qt5ctplatformtheme.h new/qt5ct-1.0/src/qt5ct-qtplugin/qt5ctplatformtheme.h --- old/qt5ct-0.41/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -85,7 +85,7 @@ virtual const QFont *font(Font type = SystemFont) const override; virtual QVariant themeHint(ThemeHint hint) const override; #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) - virtual QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = 0) const override; + virtual QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = {}) const override; #endif //virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const; //virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size, @@ -110,7 +110,7 @@ QString loadStyleSheets(const QStringList &paths); QPalette loadColorScheme(const QString &filePath); QString m_style, m_iconTheme, m_userStyleSheet, m_prevStyleSheet; - QPalette *m_customPalette = nullptr; + QPalette *m_palette = nullptr; QFont m_generalFont, m_fixedFont; int m_doubleClickInterval; int m_cursorFlashTime; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct-style/plugin.cpp new/qt5ct-1.0/src/qt5ct-style/plugin.cpp --- old/qt5ct-0.41/src/qt5ct-style/plugin.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct-style/plugin.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct-style/qt5ctproxystyle.cpp new/qt5ct-1.0/src/qt5ct-style/qt5ctproxystyle.cpp --- old/qt5ct-0.41/src/qt5ct-style/qt5ctproxystyle.cpp 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct-style/qt5ctproxystyle.cpp 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/src/qt5ct-style/qt5ctproxystyle.h new/qt5ct-1.0/src/qt5ct-style/qt5ctproxystyle.h --- old/qt5ct-0.41/src/qt5ct-style/qt5ctproxystyle.h 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/src/qt5ct-style/qt5ctproxystyle.h 2020-06-10 17:29:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2020, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.41/test.sh new/qt5ct-1.0/test.sh --- old/qt5ct-0.41/test.sh 2019-09-04 21:52:45.000000000 +0200 +++ new/qt5ct-1.0/test.sh 2020-06-10 17:29:11.000000000 +0200 @@ -4,7 +4,8 @@ mkdir -p ${MYDIR}/src/qt5ct/styles ln -s "../../qt5ct-style/libqt5ct-style.so" "${MYDIR}/src/qt5ct/styles/" -export QT_DEBUG_PLUGINS=1 +#export QT_DEBUG_PLUGINS=1 +export QT_LOGGING_RULES="qt5ct.debug=true" export QT_QPA_PLATFORMTHEME=qt5ct export QT_QPA_PLATFORM_PLUGIN_PATH=${MYDIR}/src/qt5ct-qtplugin ${MYDIR}/src/qt5ct/qt5ct
