diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index bdab148..173e12b 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE #endif + + class QtButtonPropertyBrowserPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtButtonPropertyBrowser : public QtAbstractPropertyBrowser @@ -76,10 +78,11 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index bdab148..173e12b 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE #endif + + class QtButtonPropertyBrowserPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtButtonPropertyBrowser : public QtAbstractPropertyBrowser @@ -76,10 +78,11 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index cbb2077..d914702 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,6 +48,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -65,12 +72,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -90,11 +97,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -114,11 +121,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -138,10 +145,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -161,13 +168,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -187,12 +194,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -212,11 +219,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -236,9 +243,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -258,9 +265,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -280,9 +287,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -302,9 +309,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -324,13 +331,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -350,9 +357,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -372,9 +379,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -394,9 +401,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index bdab148..173e12b 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE #endif + + class QtButtonPropertyBrowserPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtButtonPropertyBrowser : public QtAbstractPropertyBrowser @@ -76,10 +78,11 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index cbb2077..d914702 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,6 +48,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -65,12 +72,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -90,11 +97,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -114,11 +121,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -138,10 +145,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -161,13 +168,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -187,12 +194,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -212,11 +219,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -236,9 +243,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -258,9 +265,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -280,9 +287,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -302,9 +309,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -324,13 +331,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -350,9 +357,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -372,9 +379,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -394,9 +401,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index 78b4a9b..d80a065 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,9 +68,10 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index bdab148..173e12b 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE #endif + + class QtButtonPropertyBrowserPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtButtonPropertyBrowser : public QtAbstractPropertyBrowser @@ -76,10 +78,11 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index cbb2077..d914702 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,6 +48,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -65,12 +72,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -90,11 +97,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -114,11 +121,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -138,10 +145,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -161,13 +168,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -187,12 +194,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -212,11 +219,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -236,9 +243,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -258,9 +265,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -280,9 +287,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -302,9 +309,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -324,13 +331,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -350,9 +357,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -372,9 +379,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -394,9 +401,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index 78b4a9b..d80a065 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,9 +68,10 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6b734f0..6185d01 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,13 +319,14 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index bdab148..173e12b 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE #endif + + class QtButtonPropertyBrowserPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtButtonPropertyBrowser : public QtAbstractPropertyBrowser @@ -76,10 +78,11 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index cbb2077..d914702 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,6 +48,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -65,12 +72,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -90,11 +97,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -114,11 +121,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -138,10 +145,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -161,13 +168,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -187,12 +194,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -212,11 +219,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -236,9 +243,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -258,9 +265,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -280,9 +287,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -302,9 +309,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -324,13 +331,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -350,9 +357,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -372,9 +379,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -394,9 +401,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index 78b4a9b..d80a065 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,9 +68,10 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6b734f0..6185d01 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,13 +319,14 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h index d6b94cc..4936887 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h @@ -49,6 +49,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QDate; class QTime; class QDateTime; @@ -368,8 +375,8 @@ QtLocalePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointPropertyManagerPrivate; @@ -397,8 +404,8 @@ QtPointPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointFPropertyManagerPrivate; @@ -429,8 +436,8 @@ QtPointFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePropertyManagerPrivate; @@ -464,8 +471,8 @@ QtSizePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizeFPropertyManagerPrivate; @@ -502,8 +509,8 @@ QtSizeFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectPropertyManagerPrivate; @@ -534,8 +541,8 @@ QtRectPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectFPropertyManagerPrivate; @@ -569,8 +576,8 @@ QtRectFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtEnumPropertyManagerPrivate; @@ -633,8 +640,8 @@ QtFlagPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePolicyPropertyManagerPrivate; @@ -663,9 +670,9 @@ QtSizePolicyPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtFontPropertyManagerPrivate; @@ -696,12 +703,12 @@ QtFontPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) - Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) - Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) + X_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) }; class QtColorPropertyManagerPrivate; @@ -730,8 +737,8 @@ QtColorPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtCursorPropertyManagerPrivate; diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index bdab148..173e12b 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE #endif + + class QtButtonPropertyBrowserPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtButtonPropertyBrowser : public QtAbstractPropertyBrowser @@ -76,10 +78,11 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index cbb2077..d914702 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,6 +48,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -65,12 +72,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -90,11 +97,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -114,11 +121,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -138,10 +145,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -161,13 +168,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -187,12 +194,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -212,11 +219,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -236,9 +243,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -258,9 +265,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -280,9 +287,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -302,9 +309,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -324,13 +331,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -350,9 +357,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -372,9 +379,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -394,9 +401,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index 78b4a9b..d80a065 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,9 +68,10 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6b734f0..6185d01 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,13 +319,14 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h index d6b94cc..4936887 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h @@ -49,6 +49,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QDate; class QTime; class QDateTime; @@ -368,8 +375,8 @@ QtLocalePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointPropertyManagerPrivate; @@ -397,8 +404,8 @@ QtPointPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointFPropertyManagerPrivate; @@ -429,8 +436,8 @@ QtPointFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePropertyManagerPrivate; @@ -464,8 +471,8 @@ QtSizePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizeFPropertyManagerPrivate; @@ -502,8 +509,8 @@ QtSizeFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectPropertyManagerPrivate; @@ -534,8 +541,8 @@ QtRectPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectFPropertyManagerPrivate; @@ -569,8 +576,8 @@ QtRectFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtEnumPropertyManagerPrivate; @@ -633,8 +640,8 @@ QtFlagPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePolicyPropertyManagerPrivate; @@ -663,9 +670,9 @@ QtSizePolicyPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtFontPropertyManagerPrivate; @@ -696,12 +703,12 @@ QtFontPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) - Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) - Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) + X_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) }; class QtColorPropertyManagerPrivate; @@ -730,8 +737,8 @@ QtColorPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtCursorPropertyManagerPrivate; diff --git a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h index 7a3057f..735242c 100644 --- a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h @@ -123,12 +123,12 @@ QtTreePropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTreePropertyBrowser) Q_DISABLE_COPY(QtTreePropertyBrowser) - +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotExpanded(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotCurrentBrowserItemChanged(QtBrowserItem *)) Q_PRIVATE_SLOT(d_func(), void slotCurrentTreeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index bdab148..173e12b 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE #endif + + class QtButtonPropertyBrowserPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtButtonPropertyBrowser : public QtAbstractPropertyBrowser @@ -76,10 +78,11 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index cbb2077..d914702 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,6 +48,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -65,12 +72,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -90,11 +97,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -114,11 +121,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -138,10 +145,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -161,13 +168,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -187,12 +194,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -212,11 +219,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -236,9 +243,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -258,9 +265,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -280,9 +287,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -302,9 +309,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -324,13 +331,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -350,9 +357,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -372,9 +379,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -394,9 +401,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index 78b4a9b..d80a065 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,9 +68,10 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6b734f0..6185d01 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,13 +319,14 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h index d6b94cc..4936887 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h @@ -49,6 +49,13 @@ QT_BEGIN_NAMESPACE #endif +#undef X_PRIVATE_SLOT +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) +# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) +#else +# define X_PRIVATE_SLOT(...) +#endif + class QDate; class QTime; class QDateTime; @@ -368,8 +375,8 @@ QtLocalePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointPropertyManagerPrivate; @@ -397,8 +404,8 @@ QtPointPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointFPropertyManagerPrivate; @@ -429,8 +436,8 @@ QtPointFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePropertyManagerPrivate; @@ -464,8 +471,8 @@ QtSizePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizeFPropertyManagerPrivate; @@ -502,8 +509,8 @@ QtSizeFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectPropertyManagerPrivate; @@ -534,8 +541,8 @@ QtRectPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectFPropertyManagerPrivate; @@ -569,8 +576,8 @@ QtRectFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtEnumPropertyManagerPrivate; @@ -633,8 +640,8 @@ QtFlagPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePolicyPropertyManagerPrivate; @@ -663,9 +670,9 @@ QtSizePolicyPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtFontPropertyManagerPrivate; @@ -696,12 +703,12 @@ QtFontPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) - Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) - Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) + X_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) }; class QtColorPropertyManagerPrivate; @@ -730,8 +737,8 @@ QtColorPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) - Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtCursorPropertyManagerPrivate; diff --git a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h index 7a3057f..735242c 100644 --- a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h @@ -123,12 +123,12 @@ QtTreePropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTreePropertyBrowser) Q_DISABLE_COPY(QtTreePropertyBrowser) - +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotExpanded(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotCurrentBrowserItemChanged(QtBrowserItem *)) Q_PRIVATE_SLOT(d_func(), void slotCurrentTreeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)) - +#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtvariantproperty.h b/3rdParty/qtpropertybrowser/src/qtvariantproperty.h index 2c09fe9..4090292 100644 --- a/3rdParty/qtpropertybrowser/src/qtvariantproperty.h +++ b/3rdParty/qtpropertybrowser/src/qtvariantproperty.h @@ -117,6 +117,7 @@ virtual QtProperty *createProperty(); private: QtVariantPropertyManagerPrivate *d_ptr; +#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) @@ -156,6 +157,7 @@ Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) +#endif Q_DECLARE_PRIVATE(QtVariantPropertyManager) Q_DISABLE_COPY(QtVariantPropertyManager) };