Skip to content

Instantly share code, notes, and snippets.

@azbesthu
Created February 6, 2014 17:25
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save azbesthu/8848723 to your computer and use it in GitHub Desktop.
Save azbesthu/8848723 to your computer and use it in GitHub Desktop.
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index b6fb854..10f8710 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/src/core/javascript_dialog_controller.cpp b/src/core/javascript_dialog_controller.cpp
index ed04310..d1ce158 100644
--- a/src/core/javascript_dialog_controller.cpp
+++ b/src/core/javascript_dialog_controller.cpp
@@ -45,6 +45,8 @@
#include"javascript_dialog_manager_qt.h"
#include "type_conversion.h"
+QT_BEGIN_NAMESPACE
+
void JavaScriptDialogControllerPrivate::dialogFinished(bool accepted, const base::string16 &promptValue)
{
// Clear the queue first as this could result in the engine asking us to run another dialog.
@@ -102,3 +104,7 @@ JavaScriptDialogController::JavaScriptDialogController(JavaScriptDialogControlle
Q_ASSERT(dd);
d.reset(dd);
}
+
+QT_END_NAMESPACE
+
+#include "moc_javascript_dialog_controller.cpp"
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf
index 4de4495..e2ae92c 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
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment