diff options
author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2013-06-05 11:12:37 +0300 |
---|---|---|
committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2013-06-05 11:58:43 +0300 |
commit | 5bad049fd2192b6b00abde485f6e8171d68ca933 (patch) | |
tree | d149d8cee00e8f68e252d88fe87afc27b08539c9 /examples | |
parent | 6624f10817da99a63253799f1f99162304cbd894 (diff) |
qt5: Add conditional support for Qt5 in the build system
Based on patches by:
Andoni Morales Alastruey <ylatuya@gmail.com>
Luciana Fujii Pontello <luciana@fujii.eti.br>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qmlplayer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/recorder/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/voip/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/qmlplayer/CMakeLists.txt b/examples/qmlplayer/CMakeLists.txt index cabb111..1add76b 100644 --- a/examples/qmlplayer/CMakeLists.txt +++ b/examples/qmlplayer/CMakeLists.txt @@ -35,7 +35,7 @@ else() endif() set(qmlplayer_SOURCES main.cpp player.cpp) -qt4_add_resources(qmlplayer_rcc_SOURCES qmlplayer.qrc) +qt_helper_add_resources(qmlplayer_rcc_SOURCES qmlplayer.qrc) add_executable(qmlplayer ${qmlplayer_SOURCES} diff --git a/examples/recorder/CMakeLists.txt b/examples/recorder/CMakeLists.txt index fa30e9e..25a2ac4 100644 --- a/examples/recorder/CMakeLists.txt +++ b/examples/recorder/CMakeLists.txt @@ -10,6 +10,6 @@ include_directories(${QTGSTREAMER_INCLUDES}) add_definitions(${QTGSTREAMER_DEFINITIONS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}") -qt4_wrap_ui(recorder_UI_SRCS recorder.ui) +qt_helper_wrap_ui(recorder_UI_SRCS recorder.ui) add_executable(recorder main.cpp ${recorder_UI_SRCS}) target_link_libraries(recorder ${QTGSTREAMER_LIBRARIES} ${QT_QTGUI_LIBRARY}) diff --git a/examples/voip/CMakeLists.txt b/examples/voip/CMakeLists.txt index d16dfae..5735dbd 100644 --- a/examples/voip/CMakeLists.txt +++ b/examples/voip/CMakeLists.txt @@ -10,6 +10,6 @@ include_directories(${QTGSTREAMER_INCLUDES}) add_definitions(${QTGSTREAMER_DEFINITIONS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}") -qt4_wrap_ui(voip_UI_SRCS voip.ui) +qt_helper_wrap_ui(voip_UI_SRCS voip.ui) add_executable(voip main.cpp ${voip_UI_SRCS}) target_link_libraries(voip ${QTGSTREAMER_UI_LIBRARIES}) |