From 9485ca9d43dcab732325e4ba16194153ea293d4b Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sat, 1 Aug 2015 20:41:27 +0200 Subject: Revert "debugqt: Port to Qt5 [O. Galibert]" Experience shows it's too early for that. I'll keep that in a corner and we'll see again later. --- scripts/src/osd/modules.lua | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'scripts/src/osd/modules.lua') diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index a356986bbab..bf6897a2585 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-qt5 2>/dev/null") + MOCTST = backtick("which moc-qt4 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 Qt5Widgets"), + backtick("pkg-config --cflags QtGui"), } end end @@ -237,18 +237,16 @@ function osdmodulestargetconf() } links { "qtmain", - "Qt5Core", - "Qt5Gui", - "Qt5Widgets", + "QtGui4", + "QtCore4", } elseif _OPTIONS["targetos"]=="macosx" then linkoptions { "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), } links { - "Qt5Core.framework", - "Qt5Gui.framework", - "Qt5Widgets.framework", + "QtCore.framework", + "QtGui.framework", } else if _OPTIONS["QT_HOME"]~=nil then @@ -256,12 +254,11 @@ function osdmodulestargetconf() "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), } links { - "Qt5Core", - "Qt5Gui", - "Qt5Widgets", + "QtGui", + "QtCore", } else - local str = backtick("pkg-config --libs Qt5Widgets") + local str = backtick("pkg-config --libs QtGui") addlibfromstring(str) addoptionsfromstring(str) end -- cgit v1.2.3-70-g09d2