q3k/openlase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch from QT4_AUTOMOC to QT4_WRAP_CPP

Browse source
This commit is contained in:
Hector Martin 2011-04-09 15:31:09 +02:00
parent b19a7b634a
commit 72a7266daf
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
output/CMakeLists.txt
View file

@ -20,11 +20,11 @@ if(QT4_FOUND)
include(${QT_USE_FILE})
QT4_WRAP_UI(output_UIS_H output_settings.ui)
QT4_AUTOMOC(output_settings.cpp output.cpp)
QT4_WRAP_CPP(output_MOCS output_settings.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(output output.cpp output_settings.cpp ${output_UIS_H})
add_executable(output output.cpp output_settings.cpp ${output_UIS_H} ${output_MOCS})
target_link_libraries(output ${JACK_LIBRARIES} ${QT_LIBRARIES})
else()
message(STATUS "Will NOT build output (Qt4 missing)")

3
output/output_settings.cpp
View file

@ -17,11 +17,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "output_settings.moc"
#include <QMessageBox>
#include <QGraphicsLineItem>
#include <stdio.h>
#include "output_settings.h"
#define ASPECT_1_1 0
#define ASPECT_4_3 1

4
tools/qplayvid/CMakeLists.txt
View file

@ -19,11 +19,11 @@
if(QT4_FOUND AND FFMPEG_FOUND)
include(${QT_USE_FILE})
QT4_AUTOMOC(qplayvid_gui.cpp qplayvid.cpp)
QT4_WRAP_CPP(qplayvid_MOCS qplayvid_gui.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(qplayvid qplayvid.c qplayvid_gui.cpp)
add_executable(qplayvid qplayvid.c qplayvid_gui.cpp ${qplayvid_MOCS})
target_link_libraries(qplayvid openlase ${FFMPEG_LIBRARIES} ${QT_LIBRARIES})
else()
message(STATUS "Will NOT build qplayvid (Qt4 or FFmpeg missing)")

4
tools/qplayvid/qplayvid_gui.cpp
View file

@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "qplayvid_gui.moc"
#include <QApplication>
#include <QMessageBox>
#include <QVBoxLayout>
@ -32,6 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <QFile>
#include <QTextStream>
#include "qplayvid_gui.h"
#define Setting(name, ...) \
addSetting(new PlayerSetting(this, #name, settings.name, __VA_ARGS__))