← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

Re: [Merge] lp:~popey/ubuntu-terminal-app/add-snapcraft-config into lp:ubuntu-terminal-app

 

Replied inline again, thanks!

Diff comments:

> 
> === modified file 'src/plugin/qmltermwidget/CMakeLists.txt'
> --- src/plugin/qmltermwidget/CMakeLists.txt	2014-11-15 14:39:05 +0000
> +++ src/plugin/qmltermwidget/CMakeLists.txt	2016-09-08 11:44:05 +0000
> @@ -70,6 +70,7 @@
>  
>  # Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator
>  if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
> +    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR})
>      add_custom_target(qmltermwidget-qmldir ALL

Ack, thanks! In that case, I'd say the only thing we need to do in addition to this change is to drop the now duplicate L83.

>          COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/src/qmldir ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
>          DEPENDS ${QMLFILES}


-- 
https://code.launchpad.net/~popey/ubuntu-terminal-app/add-snapcraft-config/+merge/305206
Your team Ubuntu Terminal Developers is subscribed to branch lp:ubuntu-terminal-app.


References