FreeBSD: Backport patches to solve issue TDE/tde#128.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 06aeda1081
)
pull/257/head
parent
ea254eaa39
commit
b050ce8162
@ -0,0 +1,34 @@
|
||||
commit 41336d84c91181da148be31a0b9f469037d3669d
|
||||
Author: Michele Calgaro <michele.calgaro@yahoo.it>
|
||||
Date: Mon Jun 12 22:15:53 2023 +0900
|
||||
|
||||
Rework and fix commit 4d90cc61
|
||||
|
||||
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
|
||||
(cherry picked from commit 54b58986491c48408c720d706e5cbfd1043d3ee6)
|
||||
|
||||
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
|
||||
index 43b0c808..cbe1a81d 100644
|
||||
--- a/tdeio/tdeio/job.cpp
|
||||
+++ b/tdeio/tdeio/job.cpp
|
||||
@@ -114,9 +114,18 @@ public:
|
||||
unsigned long m_userTimestamp;
|
||||
};
|
||||
|
||||
-static TQObject *__job_root_obj = new TQObject(0, "jobroot");
|
||||
+static TQObject *__job_root_obj = nullptr;
|
||||
|
||||
-Job::Job(bool showProgressInfo) : TQObject(__job_root_obj, "job"), m_error(0), m_percent(0)
|
||||
+static TQObject* __getJobRoot()
|
||||
+{
|
||||
+ if (!__job_root_obj)
|
||||
+ {
|
||||
+ __job_root_obj = new TQObject(0, "jobroot");
|
||||
+ }
|
||||
+ return __job_root_obj;
|
||||
+}
|
||||
+
|
||||
+Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m_percent(0)
|
||||
, m_progressId(0), m_speedTimer(0), d( new JobPrivate )
|
||||
{
|
||||
// All jobs delete themselves after emiting 'result'.
|
@ -0,0 +1,28 @@
|
||||
commit 984ea06ed6ce702d98fcfe08dc353d58f3f0bcbc
|
||||
Author: Michele Calgaro <michele.calgaro@yahoo.it>
|
||||
Date: Mon Jun 12 10:46:33 2023 +0900
|
||||
|
||||
Revert "Add single TQObject root parent for all guarded pointers."
|
||||
Commit b167d09c was functionally incorrect and is causing issues on
|
||||
selected distributions.
|
||||
This reverts commit b167d09c43be6c8b7d30f0d4fb1bf1e86c51b8a7.
|
||||
This resolves issue TDE/tde#128.
|
||||
|
||||
(cherry picked from commit fb1f3d64451e8cc405b5db572e2c506564a05680)
|
||||
|
||||
diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp
|
||||
index 3ac27e7a..803e75e1 100644
|
||||
--- a/src/kernel/qguardedptr.cpp
|
||||
+++ b/src/kernel/qguardedptr.cpp
|
||||
@@ -194,10 +194,9 @@
|
||||
|
||||
/* Internal classes */
|
||||
|
||||
-static TQObject *__ptrpriv_root_obj = new TQObject(0, "_ptrpriv_root");
|
||||
|
||||
TQGuardedPtrPrivate::TQGuardedPtrPrivate( TQObject* o)
|
||||
- : TQObject(__ptrpriv_root_obj, "_ptrpriv" ), obj( o )
|
||||
+ : TQObject(0, "_ptrpriv" ), obj( o )
|
||||
{
|
||||
if ( obj )
|
||||
connect( obj, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) );
|
Loading…
Reference in new issue