summaryrefslogtreecommitdiffstats
path: root/src/kernel/qapplication.cpp
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2024-03-19 05:56:36 +0300
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-04-03 09:02:22 +0900
commitf2504a8f49b5311070eff4245b87ee2f685ae28a (patch)
treebc8039e8a6afcc3f6aeaf26253ab770c2c3c638e /src/kernel/qapplication.cpp
parentb000ed6ad6d2b02a3e8c84675ff1abfa3b3df6ce (diff)
downloadtqt-f2504a8f49b5311070eff4245b87ee2f685ae28a.tar.gz
tqt-f2504a8f49b5311070eff4245b87ee2f685ae28a.zip
Improve TQFont-related cleanup
Improve TQFont cleanup making sure that all instances of TQFont are destroyed before TQApplication (or specifically before disconnect from X11). This gets reed of several valgrind complains about leaks deep inside fontconfig. Signed-off-by: Alexander Golubev <fatzer2@gmail.com> (cherry picked from commit ffbaaf0e1c181dd0f0d8ad7b273530f7cda086da)
Diffstat (limited to 'src/kernel/qapplication.cpp')
-rw-r--r--src/kernel/qapplication.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index e8658cdab..87d4fd7d0 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -1203,6 +1203,12 @@ TQApplication::~TQApplication()
tqt_desktopWidget = 0;
is_app_closing = TRUE;
+ // Due to hacks to spead up TQStyle engine (see git hash 523c1fd99) TQObjects now contain a
+ // reference to TQStyleControlElementData object which among other contain TQFont members.
+ // But for a proper cleanup all fonts should be destroyed before disconnecting from X11 (in
+ // tqt_cleanup()). So we will have to cleanup up the data explicitly.
+ cleanupControlElementData();
+
#ifndef TQT_NO_CLIPBOARD
delete tqt_clipboard;
tqt_clipboard = 0;