feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TaskTree: Compile fix

Browse Source 
Fix "Tasking::operator !': redefinition; different linkage" error.

Amends 0f5882f13c
Amends 490410e18d

Change-Id: I5d03b9543c194fc3dc72be89840e70c72f8f2fa6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-03 00:20:58 +02:00
parent 73e87437c9
commit d1a4917d29
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/solutions/tasking/tasktree.h
View File

@@ -308,18 +308,16 @@ protected:
ExecutableItem(const TaskHandler &handler) : GroupItem(handler) {} ExecutableItem(const TaskHandler &handler) : GroupItem(handler) {}
private: private:
friend ExecutableItem operator!(const ExecutableItem &item); TASKING_EXPORT friend ExecutableItem operator!(const ExecutableItem &item);
friend ExecutableItem operator&&(const ExecutableItem &first, const ExecutableItem &second); TASKING_EXPORT friend ExecutableItem operator&&(const ExecutableItem &first,
friend ExecutableItem operator||(const ExecutableItem &first, const ExecutableItem &second); const ExecutableItem &second);
TASKING_EXPORT friend ExecutableItem operator||(const ExecutableItem &first,
const ExecutableItem &second);
ExecutableItem withCancelImpl( ExecutableItem withCancelImpl(
const std::function<void(QObject *, const std::function<void()> &)> &connectWrapper) const; const std::function<void(QObject *, const std::function<void()> &)> &connectWrapper) const;
}; };
TASKING_EXPORT ExecutableItem operator!(const ExecutableItem &item);
TASKING_EXPORT ExecutableItem operator&&(const ExecutableItem &first, const ExecutableItem &second);
TASKING_EXPORT ExecutableItem operator||(const ExecutableItem &first, const ExecutableItem &second);
class TASKING_EXPORT Group : public ExecutableItem class TASKING_EXPORT Group : public ExecutableItem
{ {
public: public: