diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-10-11 13:34:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 16:07:58 +0200 |
| commit | 4a324d488d23ae9fed0e9fd415dc88613121c780 (patch) | |
| tree | f9e7194c012d86480e05395786d723cc6d71c2a2 | |
| parent | 3062467e7ae4ca68377216083e015846b307e5a0 (diff) | |
Do not forward declare OBJC types.
We have to disable forward declaration of objective-c
types in Qt when building chromium code.
Chromium does have different, incompatible
forward declarations.
Change-Id: Ib7f7e9839e5c85d758d1e5bb921e67c57a55c4ef
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| -rw-r--r-- | lib/lib.pro | 3 | ||||
| -rw-r--r-- | shared/shared.pro | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/lib.pro b/lib/lib.pro index 701e7d359..e9689fa39 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -10,7 +10,8 @@ TEMPLATE = lib TARGET = Qt5WebEngineCore # Defining keywords such as 'signal' clashes with the chromium code base. -DEFINES += QT_NO_KEYWORDS +DEFINES += QT_NO_KEYWORDS \ + Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS # We need a way to tap into gyp´s Debug vs. Release configuration PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBENGINEPROCESS_NAME\\\" diff --git a/shared/shared.pro b/shared/shared.pro index 3826bb5ed..108a9a255 100644 --- a/shared/shared.pro +++ b/shared/shared.pro @@ -10,7 +10,8 @@ CONFIG += static TARGET = qtwebengine_shared # Defining keywords such as 'signal' clashes with the chromium code base. -DEFINES += QT_NO_KEYWORDS +DEFINES += QT_NO_KEYWORDS \ + Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS # We need a way to tap into gyp´s Debug vs. Release configuration PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBENGINEPROCESS_NAME\\\" |