summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-12-19 12:04:03 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-01-06 17:48:29 +0100
commitacf80b9a2b913e898ed4c4ed14d4ea79401484fe (patch)
tree238fb0e6087a287d2e48338360c0f265dbc531b3
parent9d9b785259103ebed616bd59a3b3f2fd6cb95019 (diff)
Fix build error with Intel Compiler 15 on Windows
If the constructor is inline, the generated code needs access to the vtable, which gets emitted with the first virtual function (in QtGui), but somehow icl.exe can't find it in debug. Looking at the .obj files it generates and comparing to MSVC, it seems that: - both generate and export the inline constructor from Qt5Guid.dll - MSVC will call that constructor from qoffscreenintegration.obj - icl.exe will inline the constructor and requires a symbol not exported from Qt5Guid.dll I can't explain why (probably a compiler bug). Change-Id: I0ab9c078ae4fc794826025d68d364124c7247e80 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
-rw-r--r--src/gui/kernel/qplatformservices.cpp3
-rw-r--r--src/gui/kernel/qplatformservices.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformservices.cpp b/src/gui/kernel/qplatformservices.cpp
index e11a1858f6..2188920c86 100644
--- a/src/gui/kernel/qplatformservices.cpp
+++ b/src/gui/kernel/qplatformservices.cpp
@@ -49,6 +49,9 @@ QT_BEGIN_NAMESPACE
\brief The QPlatformServices provides the backend for desktop-related functionality.
*/
+QPlatformServices::QPlatformServices()
+{ }
+
bool QPlatformServices::openUrl(const QUrl &url)
{
qWarning("This plugin does not support QPlatformServices::openUrl() for '%s'.",
diff --git a/src/gui/kernel/qplatformservices.h b/src/gui/kernel/qplatformservices.h
index 00a87d51f5..005748d18c 100644
--- a/src/gui/kernel/qplatformservices.h
+++ b/src/gui/kernel/qplatformservices.h
@@ -52,6 +52,7 @@ class QUrl;
class Q_GUI_EXPORT QPlatformServices
{
public:
+ QPlatformServices();
virtual ~QPlatformServices() { }
virtual bool openUrl(const QUrl &url);