diff options
| author | 2016-04-16 08:57:01 +0200 | |
|---|---|---|
| committer | 2016-04-16 08:57:01 +0200 | |
| commit | 0876691a6fccef5f979fc69214039b695235a266 (patch) | |
| tree | 9c3499855040557ba7911a45909e672f1be501be /scripts/src | |
| parent | 0fb1cf683712ceef7e50e4f71c9ebcbe464b16eb (diff) | |
| parent | 3176347abcb8751becdca0889107fae061fb30f9 (diff) | |
Merge pull request #813 from jmallach/qt5-build
Pass explicit -qt5 to all moc and qmake calls.
Diffstat (limited to 'scripts/src')
| -rw-r--r-- | scripts/src/osd/modules.lua | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index fb48d20a2d5..eb8e0831062 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -288,14 +288,14 @@ function qtdebuggerbuild() MOC = "moc" else if _OPTIONS["QT_HOME"]~=nil then - QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake --version 2>/dev/null") + QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 --version 2>/dev/null") if (QMAKETST=='') then print("Qt's Meta Object Compiler (moc) wasn't found!") os.exit(1) end - MOC = _OPTIONS["QT_HOME"] .. "/bin/moc" + MOC = _OPTIONS["QT_HOME"] .. "/bin/moc -qt5" else - MOCTST = backtick("which moc-qt5 2>/dev/null") + MOCTST = backtick("which moc 2>/dev/null") if (MOCTST=='') then MOCTST = backtick("which moc 2>/dev/null") end @@ -303,7 +303,7 @@ function qtdebuggerbuild() print("Qt's Meta Object Compiler (moc) wasn't found!") os.exit(1) end - MOC = MOCTST + MOC = MOCTST .. " -qt5" end end @@ -324,17 +324,17 @@ function qtdebuggerbuild() if _OPTIONS["targetos"]=="windows" then configuration { "mingw*" } buildoptions { - "-I$(shell qmake -query QT_INSTALL_HEADERS)", + "-I$(shell qmake -qt5 -query QT_INSTALL_HEADERS)", } configuration { } elseif _OPTIONS["targetos"]=="macosx" then buildoptions { - "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), + "-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"), } else if _OPTIONS["QT_HOME"]~=nil then buildoptions { - "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"), + "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_HEADERS"), } else buildoptions { @@ -386,7 +386,7 @@ function osdmodulestargetconf() if _OPTIONS["USE_QTDEBUG"]=="1" then if _OPTIONS["targetos"]=="windows" then linkoptions { - "-L$(shell qmake -query QT_INSTALL_LIBS)", + "-L$(shell qmake -qt5 -query QT_INSTALL_LIBS)", } links { "qtmain", @@ -396,7 +396,7 @@ function osdmodulestargetconf() } elseif _OPTIONS["targetos"]=="macosx" then linkoptions { - "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), + "-F" .. backtick("qmake -qt5 -query QT_INSTALL_LIBS"), } links { "Qt5Core.framework", @@ -406,7 +406,7 @@ function osdmodulestargetconf() else if _OPTIONS["QT_HOME"]~=nil then linkoptions { - "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), + "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -qt5 -query QT_INSTALL_LIBS"), } links { "Qt5Core", |
