diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-10-21 09:13:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-10-21 09:13:03 +0200 |
| commit | bb9774de92dd2c8da85c5231ca5646b078cb42a3 (patch) | |
| tree | e43470cf6f3a7c965b7dc8a349593dadd03ee65e /src/plugins/projectexplorer/task.h | |
| parent | f41bebc843a8b4ab1ab29562ba200b032b5ab5ac (diff) | |
| parent | 5377253612801b2f92e0b55e40c3ce0dd2574b09 (diff) | |
Merge remote-tracking branch 'origin/6.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: If8baed5564470e550a0ba5c7720915217eec2412
Diffstat (limited to 'src/plugins/projectexplorer/task.h')
| -rw-r--r-- | src/plugins/projectexplorer/task.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index a21332c708..b95d51d34e 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -29,6 +29,7 @@ #include <utils/id.h> #include <utils/fileutils.h> +#include <utils/porting.h> #include <QIcon> #include <QMetaType> @@ -135,13 +136,13 @@ public: using Tasks = QVector<Task>; -bool PROJECTEXPLORER_EXPORT operator==(const Task &t1, const Task &t2); -uint PROJECTEXPLORER_EXPORT qHash(const Task &task); +PROJECTEXPLORER_EXPORT bool operator==(const Task &t1, const Task &t2); +PROJECTEXPLORER_EXPORT Utils::QHashValueType qHash(const Task &task); -bool PROJECTEXPLORER_EXPORT operator<(const Task &a, const Task &b); +PROJECTEXPLORER_EXPORT bool operator<(const Task &a, const Task &b); -QString PROJECTEXPLORER_EXPORT toHtml(const Tasks &issues); -bool PROJECTEXPLORER_EXPORT containsType(const Tasks &issues, Task::TaskType); +PROJECTEXPLORER_EXPORT QString toHtml(const Tasks &issues); +PROJECTEXPLORER_EXPORT bool containsType(const Tasks &issues, Task::TaskType); } //namespace ProjectExplorer |