diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-09-30 12:28:19 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-10-06 11:36:46 +0200 |
| commit | d7cca67352c7e6ef69222b340b6488b48f8fae30 (patch) | |
| tree | 677f451747caceb309cb7930bcb33675b5310813 /src/corelib/global/qglobal.h | |
| parent | 0b791f6a90714deb2e46d83e072aa104707fb10f (diff) | |
Move QFunctionPointer typedef to a separate header
Task-number: QTBUG-99313
Task-number: QTBUG-106154
Change-Id: I8c62e5c2c2f80d5ce1d4dce69eebbe7d1ebbfd52
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 3bccae6729..4e9e0609f1 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -50,11 +50,6 @@ QT_BEGIN_NAMESPACE #if defined(__cplusplus) -#if 0 -#pragma qt_class(QFunctionPointer) -#endif -typedef void (*QFunctionPointer)(); - #if !defined(Q_UNIMPLEMENTED) # define Q_UNIMPLEMENTED() qWarning("Unimplemented code.") #endif @@ -92,6 +87,7 @@ QT_END_NAMESPACE #include <QtCore/qdarwinhelpers.h> #include <QtCore/qexceptionhandling.h> #include <QtCore/qforeach.h> +#include <QtCore/qfunctionpointer.h> #include <QtCore/qglobalstatic.h> #include <QtCore/qmalloc.h> #include <QtCore/qminmax.h> |