From bb1450c1a8de564df88b9a2aae33b8f73a256d9b Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Tue, 17 Dec 2019 16:59:00 +0100 Subject: Rename example target to avoid conflicts in super build Change-Id: I974329c52b24134638fbf86a44c1d949ce41b547 Reviewed-by: Alexandru Croitor --- examples/quick/tableview/pixelator/CMakeLists.txt | 8 ++++---- examples/quick/tableview/pixelator/pixelator.pro | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'examples/quick/tableview') diff --git a/examples/quick/tableview/pixelator/CMakeLists.txt b/examples/quick/tableview/pixelator/CMakeLists.txt index ee852a3b61..64b5dcea7a 100644 --- a/examples/quick/tableview/pixelator/CMakeLists.txt +++ b/examples/quick/tableview/pixelator/CMakeLists.txt @@ -16,11 +16,11 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Quick) find_package(Qt6 COMPONENTS Qml) -add_qt_gui_executable(pixelator +add_qt_gui_executable(qml_pixelator imagemodel.cpp imagemodel.h main.cpp ) -target_link_libraries(pixelator PUBLIC +target_link_libraries(qml_pixelator PUBLIC Qt::Core Qt::Gui Qt::Qml @@ -34,14 +34,14 @@ set(qmake_immediate_resource_files "qt.png" ) -qt6_add_resources(pixelator "qmake_immediate" +qt6_add_resources(qml_pixelator "qmake_immediate" PREFIX "/" FILES ${qmake_immediate_resource_files} ) -install(TARGETS pixelator +install(TARGETS qml_pixelator RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/tableview/pixelator/pixelator.pro b/examples/quick/tableview/pixelator/pixelator.pro index 6c863cb304..a34456ff0b 100644 --- a/examples/quick/tableview/pixelator/pixelator.pro +++ b/examples/quick/tableview/pixelator/pixelator.pro @@ -1,5 +1,6 @@ TEMPLATE = app +TARGET = qml_pixelator QT += quick qml HEADERS += imagemodel.h SOURCES += main.cpp \ -- cgit v1.2.3