diff options
Diffstat (limited to 'src/plugins/platforms')
7 files changed, 21 insertions, 7 deletions
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp index 96ca531899..ca8d731e66 100644 --- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp +++ b/src/plugins/platforms/qnx/qqnxfilepicker.cpp @@ -55,6 +55,8 @@ #define qFilePickerDebug QT_NO_QDEBUG_MACRO #endif +QT_BEGIN_NAMESPACE + static const char s_filePickerTarget[] = "sys.filepicker.target"; QQnxFilePicker::QQnxFilePicker(QObject *parent) @@ -316,3 +318,5 @@ QString QQnxFilePicker::modeToString(QQnxFilePicker::Mode mode) const return QStringLiteral("Picker"); } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.h b/src/plugins/platforms/qnx/qqnxfilepicker.h index aef8f43abc..7e4f9010cc 100644 --- a/src/plugins/platforms/qnx/qqnxfilepicker.h +++ b/src/plugins/platforms/qnx/qqnxfilepicker.h @@ -38,6 +38,8 @@ #include <QObject> #include <QStringList> +QT_BEGIN_NAMESPACE + struct navigator_invoke_invocation_t; class QQnxFilePicker : public QObject, public QAbstractNativeEventFilter @@ -100,4 +102,6 @@ private: QString m_title; }; +QT_END_NAMESPACE + #endif // QQNXFILEPICKER_H diff --git a/src/plugins/platforms/qnx/qqnxsystemsettings.h b/src/plugins/platforms/qnx/qqnxsystemsettings.h index 5535e02dd8..6a99d5a70c 100644 --- a/src/plugins/platforms/qnx/qqnxsystemsettings.h +++ b/src/plugins/platforms/qnx/qqnxsystemsettings.h @@ -37,10 +37,10 @@ #include <QtCore/qhash.h> #include <qpa/qplatformtheme.h> -class QPlatformFontDatabase; - QT_BEGIN_NAMESPACE +class QPlatformFontDatabase; + QHash<QPlatformTheme::Font, QFont *> qt_qnx_createRoleFonts(QPlatformFontDatabase *fontDatabase); QT_END_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h index c32a519d97..6bde4c7354 100644 --- a/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h +++ b/src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h @@ -86,4 +86,6 @@ private: static const size_t ms_bufferSize; }; +QT_END_NAMESPACE + #endif // VIRTUALKEYBOARDPPS_H diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp index eaf44f0f72..99c44c69ef 100644 --- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp +++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp @@ -38,7 +38,7 @@ #include <QtPlatformSupport/private/qaccessiblebridgeutils_p.h> #include <QtGui/qaccessible.h> #include <QtGui/qclipboard.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp index 013f1a5b77..8b67f235bb 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp @@ -49,10 +49,6 @@ #include <QtGui/qguiapplication.h> #include <qpa/qplatformnativeinterface.h> #include <QtGui/qwindow.h> -#include <QtWidgets/qapplication.h> -#include <QtWidgets/qgraphicsitem.h> -#include <QtWidgets/qgraphicsview.h> -#include <QtWidgets/qmessagebox.h> //#include <uiautomationcoreapi.h> #ifndef UiaRootObjectId diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index 7a17942b27..d9eec9f603 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -601,6 +601,14 @@ static int choosePixelFormat(HDC hdc, break; if (iAttributes[samplesValuePosition] > 1) { iAttributes[samplesValuePosition] /= 2; + } else if (iAttributes[samplesValuePosition] == 1) { + // Fallback in case it is unable to initialize with any + // samples to avoid falling back to the GDI path + // NB: The sample attributes needs to be at the end for this + // to work correctly + iAttributes[samplesValuePosition - 1] = FALSE; + iAttributes[samplesValuePosition] = 0; + iAttributes[samplesValuePosition + 1] = 0; } else { break; } |