[sailfishos][gecko] Hack message_pump_qt's moc generation to work

Move message_pump_qt.h to ipc/chromium folder where moz.build exists and rename message_pump_qt.cc to message_pump_qt.cpp. config/rules.mk contains moc generation rules to which we should be able to pass values through well-defined variables that we would define in moz.build [1]. As I could not make moc include paths to work via LOCAL_INCLUDES. Thus, making this hack. Looks that this part of build has been failing for sometime. Likely MOZ_ENABLE_QT code path has not been tested much on upstream either. [1] https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/How_Mozilla_s_build_system_works
sailfishos · May 27, 2020 · 9a7bd12 · 9a7bd12
1 parent c159c9c
commit 9a7bd12
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/ipc/chromium/message_pump_qt.h b/ipc/chromium/message_pump_qt.h
@@ -0,0 +1 @@
+src/base/message_pump_qt.h
diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build
@@ -141,8 +141,10 @@ if os_bsd or os_linux:
         ]
     if CONFIG['MOZ_ENABLE_QT']:
         SOURCES += [
-            '!moc_message_pump_qt.cc',
-            'src/base/message_pump_qt.cc',
+            'src/base/message_pump_qt.cpp',
+        ]
+        SOURCES += [
+            '!moc_message_pump_qt.cpp',
         ]
 
 ost = CONFIG['OS_TEST']

diff --git a/ipc/chromium/src/base/message_pump_qt.cc → ipc/chromium/src/base/message_pump_qt.cpp b/ipc/chromium/src/base/message_pump_qt.cc → ipc/chromium/src/base/message_pump_qt.cpp