Fix some issues of a clang-cl developer build
- qeasingcurve.cpp: Add a cast, fixing: qeasingcurve.cpp(1515,25): error: implicit conversion between pointer-to-function and pointer-to-object is a Microsoft extension [-Werror,-Wmicrosoft-cast] - Disable copy and move of QMainWindowLayoutSeparatorHelper, fixing: qbasictimer.h(59,5): note: 'QBasicTimer' has been explicitly marked deprecated here QT_DEPRECATED_X("copy-construction is unsupported; use move-construction instead") Task-number: QTBUG-63512 Change-Id: I4d12a29cb1dcd68da9f9316c9e42992f218e6045 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
parent
2c3eaa7b87
commit
5b22d17198
@ -1512,7 +1512,7 @@ QDebug operator<<(QDebug debug, const QEasingCurve &item)
|
||||
{
|
||||
QDebugStateSaver saver(debug);
|
||||
debug << "type:" << item.d_ptr->type
|
||||
<< "func:" << item.d_ptr->func;
|
||||
<< "func:" << reinterpret_cast<const void *>(item.d_ptr->func);
|
||||
if (item.d_ptr->config) {
|
||||
debug << QString::fromLatin1("period:%1").arg(item.d_ptr->config->_p, 0, 'f', 20)
|
||||
<< QString::fromLatin1("amp:%1").arg(item.d_ptr->config->_a, 0, 'f', 20)
|
||||
|
@ -88,6 +88,10 @@ class QMainWindowLayoutSeparatorHelper
|
||||
QWidget *window() { return layout()->parentWidget(); }
|
||||
|
||||
public:
|
||||
Q_DISABLE_COPY_MOVE(QMainWindowLayoutSeparatorHelper)
|
||||
|
||||
QMainWindowLayoutSeparatorHelper() = default;
|
||||
|
||||
QList<int> hoverSeparator;
|
||||
QPoint hoverPos;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user