Merge pull request #1359 from ivaradi/qt55-update

Update Qt 5.5 compatibility patch for Xenial
This commit is contained in:
István Váradi 2019-07-30 06:49:59 +02:00 committed by GitHub
commit 5142cf026f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -38,3 +38,15 @@
}; };
} // namespace OCC } // namespace OCC
--- nextcloud-client-2.5.3.orig/src/3rdparty/kmessagewidget/kmessagewidget.cpp 2019-07-26 18:40:34.949349387 +0000
+++ nextcloud-client-2.5.3/src/3rdparty/kmessagewidget/kmessagewidget.cpp 2019-07-26 18:41:39.866478051 +0000
@@ -105,6 +105,9 @@
q->setMessageType(KMessageWidget::Information);
}
+template <typename T>
+constexpr typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
+
void KMessageWidgetPrivate::createLayout()
{
delete content->layout();