diff options
author | 2015-07-28 00:45:17 +0200 | |
---|---|---|
committer | 2015-07-29 11:19:43 +0200 | |
commit | a83ad4d11fb51771ecaff7d17a0c4ed8160430c6 (patch) | |
tree | 89b1e585f4196466204100bd4f869a34833c437e /scripts/src/osd/modules.lua | |
parent | 1b452e3bfb48e9c77e705a60ab285c382d457e8a (diff) |
debugqt: Port to Qt5 [O. Galibert]
Diffstat (limited to 'scripts/src/osd/modules.lua')
-rw-r--r-- | scripts/src/osd/modules.lua | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index bf6897a2585..a356986bbab 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -142,7 +142,7 @@ function osdmodulesbuild() end MOC = _OPTIONS["QT_HOME"] .. "/bin/moc" else - MOCTST = backtick("which moc-qt4 2>/dev/null") + MOCTST = backtick("which moc-qt5 2>/dev/null") if (MOCTST=='') then MOCTST = backtick("which moc 2>/dev/null") end @@ -185,7 +185,7 @@ function osdmodulesbuild() } else buildoptions { - backtick("pkg-config --cflags QtGui"), + backtick("pkg-config --cflags Qt5Widgets"), } end end @@ -237,16 +237,18 @@ function osdmodulestargetconf() } links { "qtmain", - "QtGui4", - "QtCore4", + "Qt5Core", + "Qt5Gui", + "Qt5Widgets", } elseif _OPTIONS["targetos"]=="macosx" then linkoptions { "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), } links { - "QtCore.framework", - "QtGui.framework", + "Qt5Core.framework", + "Qt5Gui.framework", + "Qt5Widgets.framework", } else if _OPTIONS["QT_HOME"]~=nil then @@ -254,11 +256,12 @@ function osdmodulestargetconf() "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), } links { - "QtGui", - "QtCore", + "Qt5Core", + "Qt5Gui", + "Qt5Widgets", } else - local str = backtick("pkg-config --libs QtGui") + local str = backtick("pkg-config --libs Qt5Widgets") addlibfromstring(str) addoptionsfromstring(str) end |