aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt's but QTBUG-42846 "QNSView mouseDragged: Internal mouse button tracking

Browse Source 
invalid (missing Qt::LeftButton)" was fixed. No need to hide the warning message
anymore.
(grafted from 465d6259962d52d03eca629bc059be1e594e9dd4)

--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-05-07 11:44:47 +03:00
parent ca7500b905
commit bf58fb4486
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/tape/mapplication.cpp
View File

@ -85,12 +85,23 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
} }
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
# if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) && QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
// Try hide very annoying, Qt related, warnings in Mac OS X // Try hide very annoying, Qt related, warnings in Mac OS X
// Remove after Qt fix will be released // QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton)
// https://bugreports.qt.io/browse/QTBUG-42846
if ((type == QtWarningMsg) && msg.contains("QNSView")) if ((type == QtWarningMsg) && msg.contains("QNSView"))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
# endif
// Hide Qt bug 'Assertion when reading an icns file'
// https://bugreports.qt.io/browse/QTBUG-45537
// Remove after Qt fix will be released
if ((type == QtWarningMsg) && msg.contains("QICNSHandler::read()"))
{
type = QtDebugMsg;
}
#endif #endif
// this is another one that doesn't make sense as just a debug message. pretty serious // this is another one that doesn't make sense as just a debug message. pretty serious

5
src/app/valentina/core/vapplication.cpp
View File

@ -81,12 +81,15 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
} }
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
# if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) && QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
// Try hide very annoying, Qt related, warnings in Mac OS X // Try hide very annoying, Qt related, warnings in Mac OS X
// Remove after Qt fix will be released // QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton)
// https://bugreports.qt.io/browse/QTBUG-42846
if ((type == QtWarningMsg) && msg.contains("QNSView")) if ((type == QtWarningMsg) && msg.contains("QNSView"))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
# endif
// Hide Qt bug 'Assertion when reading an icns file' // Hide Qt bug 'Assertion when reading an icns file'
// https://bugreports.qt.io/browse/QTBUG-45537 // https://bugreports.qt.io/browse/QTBUG-45537