diff options
| -rw-r--r-- | qtbase.morph | 20 | ||||
| -rw-r--r-- | src/tools/moc/main.cpp | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/qtbase.morph b/qtbase.morph new file mode 100644 index 0000000000..edbaf9d2e3 --- /dev/null +++ b/qtbase.morph @@ -0,0 +1,20 @@ +{ + "name": "qtbase", + "kind": "chunk", + "configure-commands": [ + "./configure -v -prefix /usr -opensource -confirm-license" + ], + "build-commands": [ + "make", + "touch /qtbase.build/src/corelib/corelib.pro", + "./bin/qmake -set QDOC /qtbase.build/bin/qdoc", + "make html_docs", + "./bin/qmake -unset QDOC" + ], + "install-commands": [ + "make install INSTALL_ROOT=$DESTDIR", + "./bin/qmake -set QDOC /qtbase.build/bin/qdoc", + "make install_html_docs INSTALL_ROOT=$DESTDIR", + "./bin/qmake -unset QDOC" + ] +} diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 749cca0911..4860ad9e51 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -402,6 +402,7 @@ int runMoc(int _argc, char **_argv) } moc.currentFilenames.push(filename); + pp.includes += Preprocessor::IncludePath("/usr/include"); moc.includes = pp.includes; // 1. preprocess |