napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[webview] Config header was still misplaced

Browse Source 
- use #error to produce slightly more comprehensible build failers
This commit is contained in:
Adriaan de Groot 2020-08-26 14:48:23 +02:00
parent fd384f334d
commit ae14059e8b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/webview/WebViewStep.cpp
View File

@ -9,7 +9,6 @@
*/ */
#include "WebViewStep.h" #include "WebViewStep.h"
#include "WebViewConfig.h"
#include <QVariant> #include <QVariant>

11
src/modules/webview/WebViewStep.h
View File

@ -12,6 +12,8 @@
#ifndef WEBVIEWPLUGIN_H #ifndef WEBVIEWPLUGIN_H
#define WEBVIEWPLUGIN_H #define WEBVIEWPLUGIN_H
#include "WebViewConfig.h"
#include "DllMacro.h" #include "DllMacro.h"
#include "utils/PluginFactory.h" #include "utils/PluginFactory.h"
#include "viewpages/ViewStep.h" #include "viewpages/ViewStep.h"
@ -20,9 +22,16 @@
#ifdef WEBVIEW_WITH_WEBKIT #ifdef WEBVIEW_WITH_WEBKIT
# define C_QWEBVIEW QWebView # define C_QWEBVIEW QWebView
#else #endif
#ifdef WEBVIEW_WITH_WEBENGINE
# ifdef C_QWEBVIEW
# error Both WEBENGINE and WEBKIT enabled
# endif
# define C_QWEBVIEW QWebEngineView # define C_QWEBVIEW QWebEngineView
#endif #endif
#ifndef C_QWEBVIEW
# error Neither WEBENGINE nor WEBKIT enabled
#endif
class C_QWEBVIEW; class C_QWEBVIEW;