diff options
author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-02-06 18:31:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 14:58:55 +0100 |
commit | d962355ebe007ef663fc3d7c3c74e1a3a027f694 (patch) | |
tree | a3a4f06be365c02b0f9093cd9aff7f9360e3a774 | |
parent | fcd089040ce6a3860ab4abccc6f56afcd99baeed (diff) |
Fix Qt5WebEngineCore linking on Windows
BUILDING_CHROMIUM define have to be moved to the related project
in core from default_pre.prf. Otherwise dllexport would be used
instead of dllimport while linking to webengine and webenginewidgets.
Change-Id: Ifed117f420591dcb7f97f12924b83ab86ead6216
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r-- | src/core/core_gyp_generator.pro | 3 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/default_pre.prf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index b31ffccde..f067895d5 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -21,7 +21,8 @@ qtHaveModule(v8): QT_PRIVATE += v8-private # Defining keywords such as 'signal' clashes with the chromium code base. DEFINES += QT_NO_KEYWORDS \ Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS \ - QTWEBENGINEPROCESS_NAME=\\\"$$QTWEBENGINEPROCESS_NAME\\\" + QTWEBENGINEPROCESS_NAME=\\\"$$QTWEBENGINEPROCESS_NAME\\\" \ + BUILDING_CHROMIUM # Keep Skia happy CONFIG(release, debug|release): DEFINES += NDEBUG diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index 4de449511..e2ae92cdb 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -5,8 +5,6 @@ QTWEBENGINEPROCESS_NAME = QtWebEngineProcess # Tweaks that shouldn't affect our examples !contains(_PRO_FILE_PWD_, $$QTWEBENGINE_ROOT/examples) { - # Used for our export macros - DEFINES += BUILDING_CHROMIUM # We have to disable RTTI for now since that's how chromium builds on linux unix:QMAKE_CXXFLAGS += -fno-rtti } |