From 0127adbe2c38ab50f87376ce05cbbb1ed92c2901 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 19 Mar 2013 17:35:35 +0100 Subject: ensure that each module has a .qmake.cache when properly qmake'd this makes properly configured modules (whose top-level project file was evaluated) uniformly recognizable. Change-Id: Ib127df2becb2ff7f51ee8cc5a194ff168b41c227 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_parts.prf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf index 12ba312bcd..37dc849f83 100644 --- a/mkspecs/features/qt_parts.prf +++ b/mkspecs/features/qt_parts.prf @@ -9,6 +9,9 @@ # We mean it. # +# Ensure that each module has a .qmake.cache when properly qmake'd. +cache() + load(qt_build_config) TEMPLATE = subdirs -- cgit v1.2.3 From 6786000790f18f7fe56fe64dd7969e4a8fe9513b Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 22 Mar 2013 14:28:32 +0100 Subject: Doc: Changed title of Qt Print Support's C++ Classes page. -old title created broken links in Assistant. -conforms to Qt 5 naming scheme. Change-Id: Iaf619c1264edc1f9d2fd24f7031fe6c07efd2c1d Reviewed-by: Friedemann Kleint --- src/printsupport/doc/src/qtprintsupport-module.qdoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/printsupport/doc/src/qtprintsupport-module.qdoc b/src/printsupport/doc/src/qtprintsupport-module.qdoc index 47420368e5..477b9a7097 100644 --- a/src/printsupport/doc/src/qtprintsupport-module.qdoc +++ b/src/printsupport/doc/src/qtprintsupport-module.qdoc @@ -27,7 +27,7 @@ /*! \module QtPrintSupport - \title Qt Print Support Module + \title Qt Print Support C++ Classes \brief The Qt PrintSupport module provides classes to make printing easier and portable. \ingroup modules @@ -43,4 +43,3 @@ \snippet code/doc_src_qtprintsupport.pro 0 */ - -- cgit v1.2.3 From 3eafd2e7d841c2c4dac1055a3eb38f871a307cca Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 25 Mar 2013 10:28:38 +0100 Subject: Doc: Fix typo in the property system documentation priorty -> priority Task-number: QTBUG-28756 Change-Id: I79138f49db78ee6d1b96e44585ae4c1565920b18 Reviewed-by: Sergio Ahumada --- src/corelib/doc/src/objectmodel/properties.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 66325ca6c0..39f5e80eaa 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -178,7 +178,7 @@ Suppose we have a class MyClass, which is derived from QObject and which uses the Q_OBJECT macro in its private section. We want to - declare a property in MyClass to keep track of a priorty + declare a property in MyClass to keep track of a priority value. The name of the property will be \e priority, and its type will be an enumeration type named \e Priority, which is defined in MyClass. -- cgit v1.2.3 From d8406d0e09c5bfa549f2787db7f7f01a56fee443 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Mar 2013 14:51:04 +0100 Subject: make the libexec default on windows bin/ after all the dlls being in lib/ is kind of an accident (a side effect of how qmake builds them). in fact, the libdir should be entirely irrelevant for windows deployments (and indeed, the SDK is delivered with dlls only in bin/). Change-Id: If47e72b24774721a61ba63847f6132f88ff110be Reviewed-by: Friedemann Kleint Reviewed-by: Jocelyn Turcotte --- configure | 2 +- tools/configure/configureapp.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1d5c406e67..2ea1ea435a 100755 --- a/configure +++ b/configure @@ -2824,7 +2824,7 @@ fi QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"` if [ "$XPLATFORM_MINGW" = "yes" ]; then - QT_INSTALL_LIBEXECS_DIRNAME="lib" + QT_INSTALL_LIBEXECS_DIRNAME="bin" else QT_INSTALL_LIBEXECS_DIRNAME="libexec" fi diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d27a633c72..22ee456038 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1616,7 +1616,7 @@ bool Configure::displayHelp() desc( "-libdir ", "Libraries will be installed to \n(default PREFIX/lib)"); desc( "-headerdir ", "Headers will be installed to \n(default PREFIX/include)"); desc( "-archdatadir ", "Architecture-dependent data used by Qt will be installed to \n(default PREFIX)"); - desc( "-libexecdir ", "Program executables will be installed to \n(default ARCHDATADIR/lib)"); + desc( "-libexecdir ", "Program executables will be installed to \n(default ARCHDATADIR/bin)"); desc( "-plugindir ", "Plugins will be installed to \n(default ARCHDATADIR/plugins)"); desc( "-importdir ", "Imports for QML1 will be installed to \n(default ARCHDATADIR/imports)"); desc( "-qmldir ", "Imports for QML2 will be installed to \n(default ARCHDATADIR/qml)"); @@ -3586,7 +3586,7 @@ void Configure::generateQConfigCpp() dictionary["QT_INSTALL_ARCHDATA"] = qipempty ? "" : dictionary["QT_INSTALL_PREFIX"]; if (!dictionary["QT_INSTALL_LIBEXECS"].size()) { if (dictionary["QT_INSTALL_ARCHDATA"] == dictionary["QT_INSTALL_PREFIX"]) - dictionary["QT_INSTALL_LIBEXECS"] = qipempty ? "" : dictionary["QT_INSTALL_ARCHDATA"] + "/lib"; + dictionary["QT_INSTALL_LIBEXECS"] = qipempty ? "" : dictionary["QT_INSTALL_ARCHDATA"] + "/bin"; else dictionary["QT_INSTALL_LIBEXECS"] = qipempty ? "" : dictionary["QT_INSTALL_ARCHDATA"] + "/libexec"; } -- cgit v1.2.3 From 11e9f1368be986d0e128e8f7b2423d9cc7dd5436 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 22 Mar 2013 11:17:15 +0100 Subject: Windows: Fix reported screen metrics. A call to SetProcessDPIAware() is required in some cases. Task-number: QTBUG-30063 Change-Id: Iba0203d76c8e7068bf9fd4581770c1aca76a4708 Reviewed-by: Joerg Bornemann Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowscontext.cpp | 12 ++++++++---- src/plugins/platforms/windows/qwindowscontext.h | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 99ef3aacf3..88c9bf448d 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -172,7 +172,7 @@ QWindowsUser32DLL::QWindowsUser32DLL() : updateLayeredWindowIndirect(0), isHungAppWindow(0), registerTouchWindow(0), unregisterTouchWindow(0), - getTouchInputInfo(0), closeTouchInputHandle(0) + getTouchInputInfo(0), closeTouchInputHandle(0), setProcessDPIAware(0) { } @@ -187,6 +187,7 @@ void QWindowsUser32DLL::init() updateLayeredWindowIndirect = (UpdateLayeredWindowIndirect)(library.resolve("UpdateLayeredWindowIndirect")); isHungAppWindow = (IsHungAppWindow)library.resolve("IsHungAppWindow"); + setProcessDPIAware = (SetProcessDPIAware)library.resolve("SetProcessDPIAware"); } bool QWindowsUser32DLL::initTouch() @@ -252,7 +253,7 @@ struct QWindowsContextPrivate { QSet m_registeredWindowClassNames; HandleBaseWindowHash m_windows; HDC m_displayContext; - const int m_defaultDPI; + int m_defaultDPI; QWindowsKeyMapper m_keyMapper; QWindowsMouseHandler m_mouseHandler; QWindowsMimeConverter m_mimeConverter; @@ -266,8 +267,6 @@ struct QWindowsContextPrivate { QWindowsContextPrivate::QWindowsContextPrivate() : m_systemInfo(0), - m_displayContext(GetDC(0)), - m_defaultDPI(GetDeviceCaps(m_displayContext,LOGPIXELSY)), m_oleInitializeResult(OleInitialize(NULL)), m_eventType(QByteArrayLiteral("windows_generic_MSG")), m_lastActiveWindow(0), m_asyncExpose(0) @@ -276,6 +275,11 @@ QWindowsContextPrivate::QWindowsContextPrivate() : QWindowsContext::user32dll.init(); QWindowsContext::shell32dll.init(); #endif + // Ensure metrics functions report correct data, QTBUG-30063. + if (QWindowsContext::user32dll.setProcessDPIAware) + QWindowsContext::user32dll.setProcessDPIAware(); + m_displayContext = GetDC(0); + m_defaultDPI = GetDeviceCaps(m_displayContext, LOGPIXELSY); const QSysInfo::WinVersion ver = QSysInfo::windowsVersion(); #ifndef Q_OS_WINCE diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h index 1fe71e3aff..d60b632beb 100644 --- a/src/plugins/platforms/windows/qwindowscontext.h +++ b/src/plugins/platforms/windows/qwindowscontext.h @@ -80,6 +80,7 @@ struct QWindowsUser32DLL const BLENDFUNCTION *, DWORD); typedef BOOL (WINAPI *UpdateLayeredWindowIndirect)(HWND, const UPDATELAYEREDWINDOWINFO *); typedef BOOL (WINAPI *IsHungAppWindow)(HWND); + typedef BOOL (WINAPI *SetProcessDPIAware)(); // Functions missing in Q_CC_GNU stub libraries. SetLayeredWindowAttributes setLayeredWindowAttributes; @@ -94,6 +95,9 @@ struct QWindowsUser32DLL UnregisterTouchWindow unregisterTouchWindow; GetTouchInputInfo getTouchInputInfo; CloseTouchInputHandle closeTouchInputHandle; + + // Windows Vista onwards + SetProcessDPIAware setProcessDPIAware; }; struct QWindowsShell32DLL -- cgit v1.2.3 From b51c9d689d5f1d01f97e4ba151fafccc48e6766c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Mar 2013 15:12:09 +0100 Subject: qt.conf: default LibraryExecutables to bin/ on windows this matches the platform-specific configure default. as a "side effect", this fixes the in-builddir execution of webkit examples, as the non-installed qmake now agrees with QLibraryInfo about the location of QWebProcess.exe. Task-number: QTBUG-30322 Change-Id: Id28f2c246e4bfda6d5f4d719a66a16f24bb7cdb7 Reviewed-by: Friedemann Kleint Reviewed-by: Jocelyn Turcotte --- src/corelib/global/qlibraryinfo.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 747fd87207..5fb9640b19 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -273,7 +273,11 @@ static const struct { { "Documentation", "doc" }, // should be ${Data}/doc { "Headers", "include" }, { "Libraries", "lib" }, +#ifdef Q_OS_WIN + { "LibraryExecutables", "bin" }, +#else { "LibraryExecutables", "libexec" }, // should be ${ArchData}/libexec +#endif { "Binaries", "bin" }, { "Plugins", "plugins" }, // should be ${ArchData}/plugins { "Imports", "imports" }, // should be ${ArchData}/imports -- cgit v1.2.3 From 787aa7a2a8a261f120199ef73e20c03bf212097f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 26 Mar 2013 08:30:12 +0100 Subject: Revert "qclass_lib_map.h: Fix include of the QDeclarativeView widget." This reverts commit 7b655eef489038a96c5c5ba2e80d6129eca3cf41. QDeclarativeView is back in QDeclarative. Task-number: QTBUG-25196 Change-Id: Ibe40e790c98b5129bbd844924f71cf3ca0202b5f Reviewed-by: Kai Koehne --- src/tools/uic/qclass_lib_map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index c4d4d840a6..1b13850817 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -313,7 +313,7 @@ QT_CLASS_LIB(QDeclarativePropertyValueInterceptor, QtDeclarative, qdeclarativepr QT_CLASS_LIB(QDeclarativePropertyValueSource, QtDeclarative, qdeclarativepropertyvaluesource.h) QT_CLASS_LIB(QDeclarativeScriptString, QtDeclarative, qdeclarativescriptstring.h) QT_CLASS_LIB(QDeclarativePropertyMap, QtDeclarative, qdeclarativepropertymap.h) -QT_CLASS_LIB(QDeclarativeView, QtQuick1, qdeclarativeview.h) +QT_CLASS_LIB(QDeclarativeView, QtDeclarative, qdeclarativeview.h) QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h) -- cgit v1.2.3 From 5d2a0eedb0a7f23ab9ef998c2da35b6be273764e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 26 Mar 2013 16:24:58 +0100 Subject: Changelog 5.0.2: Add Windows-specific changes. Change-Id: I6578b13d27373931107572f82458fc6d006cd86b Reviewed-by: Sergio Ahumada --- dist/changes-5.0.2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 index 108512a98a..3830fa7ba9 100644 --- a/dist/changes-5.0.2 +++ b/dist/changes-5.0.2 @@ -50,6 +50,8 @@ QtGui QtWidgets --------- +- [QTBUG-28817] Fixed QColorDialog::setOption(), QFontDialog::setOption(). + QtNetwork --------- @@ -88,6 +90,10 @@ Qt for Linux/X11 Qt for Windows -------------- + - [QTBUG-30185] Fixed adding of suffixes in Window native file save dialog. + - [QTBUG-29010, QTBUG-28531] Fixed handling of layered windows required for + translucent or non-opaque windows. + Qt for Mac OS X --------------- -- cgit v1.2.3 From 7322fe27e160d21f4ef568e9b7f0e2eda5a682f5 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 27 Mar 2013 08:39:52 +0100 Subject: qdoc: Use 'org.qt-project.' prefix in namespace Standarize the qdoc namespace to match all the others configurations. Change-Id: I364d41f20084b77ab3805e72c870147c05da1d42 Reviewed-by: Jerome Pasion --- src/tools/qdoc/doc/config/qdoc.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/qdoc/doc/config/qdoc.qdocconf b/src/tools/qdoc/doc/config/qdoc.qdocconf index 6bbe934749..84e9689f50 100644 --- a/src/tools/qdoc/doc/config/qdoc.qdocconf +++ b/src/tools/qdoc/doc/config/qdoc.qdocconf @@ -20,7 +20,7 @@ tagfile = ../html/qdoc.tags qhp.projects = QDoc qhp.QDoc.file = qdoc.qhp -qhp.QDoc.namespace = qdoc.$QT_VERSION_TAG +qhp.QDoc.namespace = org.qt-project.qdoc.$QT_VERSION_TAG qhp.QDoc.virtualFolder = qdoc qhp.QDoc.indexTitle = QDoc Manual qhp.QDoc.indexRoot = -- cgit v1.2.3 From c9f697a1d0a21afef68b5bba451d0ce2dbdfe03e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 28 Mar 2013 17:28:24 +0100 Subject: write qmake/configure/buildsystem 5.0.2 changelog Change-Id: I4d43cb1e833a4c3bc0d9f22e96f4053632ef744b Reviewed-by: Sergio Ahumada --- dist/changes-5.0.2 | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 index 3830fa7ba9..c46e09d143 100644 --- a/dist/changes-5.0.2 +++ b/dist/changes-5.0.2 @@ -22,9 +22,6 @@ information about a particular change. General Improvements -------------------- - - [QTBUG-26697] The -skip option was added to configure, which enables not - building particular modules. Typical use case: -skip webkit. - Third party components ---------------------- @@ -116,12 +113,46 @@ Qt for Windows CE * Tools * **************************************************************************** +Build System & configure +------------------------ + + - [QTBUG-26697] The -skip option was added to configure, which enables not + building particular modules. Typical use case: -skip webkit. + - [QTBUG-28769, ...] Assorted build fixes + - [QTBUG-28902] Fixed contents of installed .prl files + - [QTBUG-29110, QTBUG-29186, ...] Assorted fixes to CMake config files + - [QTBUG-29174] Fixed numerous configure options which start with -l + - [QTBUG-29400] Fixed configure -fully-process not creating .vcproj files + - [QTBUG-29453, ...] Fixed generation of pkg-config .pc files + - [QTBUG-29478] Fixed static builds with ICU + - [QTBUG-29661] Fixed QtWebProcess.exe not finding Qt DLLs. -libexec + now defaults to bin/ on Windows. + - [QTBUG-29838] Fixed module versioning when mixing releases + - [QTBUG-30102] Fixed passing of values with spaces to -device-option + - Production builds do not build examples any more. 'make install' will + copy only the example sources. + - pkg-config: qt_config is now contained only in Qt5Core.pc, and it reflects + QT_CONFIG, not the module build's CONFIG. + qmake ----- + - [QTBUG-28132] Fixed parallelized 'jom install' + - [QTBUG-29143] MSVC: Fixed parsing of /openmp + - [QTBUG-29286] MSVC: Fixed use of VERSION breaking MSVC2010 projects + - [QTBUG-29329] MSVC: Fixed misparsing of /Gs as /GS + - [QTBUG-29329] MSVC: Stopped disabling buffer security check by default + - [QTBUG-29371] Fixed generation of XCode projects for XCode 4.6 + - [QTBUG-29698] MSVC: Fixed incremental linking with non-standard shells + - [QTBUG-29700] Fixed pkg-config file generation when cross-compiling + - Qt modules are now enumerated in QT_MODULES, not QT_CONFIG. For portability, + use qtHaveModule() (since 5.0.1) or !isEmpty(QT..name) instead. - $$(VAR) style environment variable expansions will not split on whitespace any more. Use $$split() if necessary. - + - Fixed qmake -tp vc (and configure without -no-vcproj) + - MSVC: Fixed an empty VERSION causing a garbled version in .rc files + - Windows: Added support for specifying application icon (via RC_ICONS) + - Added spec for BlackBerry Playbook **************************************************************************** * Plugins * -- cgit v1.2.3 From be90d26fc60e02c0f8525740b1256ebed37086a0 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Mar 2013 16:42:49 +0100 Subject: Fix gcc OOM error when compiling in release mode O3 leads to gcc bailing out with OOM on e.g. MinGW with gcc 4.7.3 onwards. Task-number: QTBUG-29099 Change-Id: I3ce49794fa4857e756d2994454d4144cfb44ce58 Reviewed-by: Jonathan Liu Reviewed-by: Thiago Macieira --- src/gui/painting/qdrawhelper.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 0f77ae6d86..61a6f2a5f9 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -40,12 +40,17 @@ ****************************************************************************/ #if defined(__OPTIMIZE__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) \ - && (__GNUC__ * 100 + __GNUC_MINOR__ >= 404) + && (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ >= 440) // GCC 4.4 supports #pragma GCC optimize and #pragma GCC target -# pragma GCC optimize "O3" -# if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__) -# pragma GCC target "fpmath=sse" -# endif + +# if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 473) +// From GCC 4.7.3 onwards, GCC optimize can result in gcc bailing out with OOM +# pragma GCC optimize "O3" +# endif + +# if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__) +# pragma GCC target "fpmath=sse" +# endif #endif #include -- cgit v1.2.3 From 278cee7387eb0cf2d5f554ae9514ac52047feba3 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 27 Mar 2013 11:30:57 +0100 Subject: Changelog: add entry for QTBUG-29759 Conflicts: dist/changes-5.0.2 Change-Id: Ibdb85dd908368f15530db31b47c901d952bb6d93 Reviewed-by: Sergio Ahumada --- dist/changes-5.0.2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 index c46e09d143..a9d715d1e6 100644 --- a/dist/changes-5.0.2 +++ b/dist/changes-5.0.2 @@ -154,6 +154,12 @@ qmake - Windows: Added support for specifying application icon (via RC_ICONS) - Added spec for BlackBerry Playbook +moc +--- + + - [QTBUG-29759] Fixed infinite recursion in macro substitution which + prevented some headers to compile. + **************************************************************************** * Plugins * **************************************************************************** -- cgit v1.2.3 From e777e3f1ecc72d0958386ac6975c45c8d36081f1 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 27 Mar 2013 16:53:42 +0100 Subject: Boxes: Check for opengl version in .pro file Make sure that people get an understandable error message when trying to compile the boxes demo with e.g. ANGLE. Task-number: QTBUG-30406 Change-Id: I0ba0e26e424d768f95d7977862d9f2c4e85b41fb Reviewed-by: Jonathan Liu Reviewed-by: Gunnar Sletta Reviewed-by: Thomas Hartmann --- examples/widgets/graphicsview/boxes/boxes.pro | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index a4b253c580..93621878f1 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -1,5 +1,11 @@ QT += opengl widgets +contains(QT_CONFIG, opengles.) { + contains(QT_CONFIG, angle): \ + warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c") + error("This example requires Qt to be configured with -opengl desktop") +} + HEADERS += 3rdparty/fbm.h \ glbuffers.h \ glextensions.h \ -- cgit v1.2.3