Qt5: QDesktopWidget is deprecated use QScreen [-Wdeprecated-declarations]
This commit is contained in:
@@ -64,6 +64,10 @@
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <math.h>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||
# include <QScreen>
|
||||
#endif
|
||||
|
||||
#include "qtcolorpicker.h"
|
||||
|
||||
/*! \class QtColorPicker
|
||||
@@ -312,7 +316,11 @@ void QtColorPicker::buttonPressed(bool toggled)
|
||||
if (!toggled)
|
||||
return;
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||
const QRect desktop = QApplication::primaryScreen()->geometry();
|
||||
#else
|
||||
const QRect desktop = QApplication::desktop()->geometry();
|
||||
#endif
|
||||
// Make sure the popup is inside the desktop.
|
||||
QPoint pos = mapToGlobal(rect().bottomLeft());
|
||||
if (pos.x() < desktop.left())
|
||||
|
||||
Reference in New Issue
Block a user