Skip to content

Instantly share code, notes, and snippets.

@t-ashula
Last active August 29, 2015 14:03
Show Gist options
  • Save t-ashula/ebbc2cc0948341c8d657 to your computer and use it in GitHub Desktop.
Save t-ashula/ebbc2cc0948341c8d657 to your computer and use it in GitHub Desktop.
qt5 + qtwebengine + windows + mingw
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 4dcd8ed..2731e0f 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -90,10 +90,11 @@ defineReplace(findOrBuildNinja) {
out = $$absolute_path("$$git_chromium_src_dir/../ninja/ninja", "$$QTWEBENGINE_ROOT")
win32: out = $$system_path($${out}.exe)
-
+ platform = ""
+ win32-g++: platform = "--platform=mingw"
# If we did not find ninja, then we bootstrap it.
!exists($$out) {
- system("python $$dirname(out)/bootstrap.py")
+ system("python $$dirname(out)/bootstrap.py $$platform")
}
return($$out)
}
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index 0b95046..13fbc98 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -21,7 +21,7 @@ defineReplace(mocAction) {
" 'inputs': ['$$INPUT_FILE',]," \
" 'outputs': ['$$OUTPUT_FILE',]," \
" 'action': ["
- for(token, MOC_COMMAND): contents += " '$$token',"
+ for(token, MOC_COMMAND): contents += " \"$$token\","
contents += " '$$INPUT_FILE'," \
" '-o'," \
" '$$OUTPUT_FILE'," \
@@ -41,7 +41,7 @@ defineReplace(rccAction) {
" 'inputs': ['$$INPUT_FILE',]," \
" 'outputs': ['$$OUTPUT_FILE',]," \
" 'action': [" \
- " '$$clean_path($$QMAKE_RCC)',"
+ " \"$$clean_path($$QMAKE_RCC)\","
for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += " '$$resource_flag',"
contents += " '-name'," \
" '$$EXTERN_FUNC'," \
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment