Skip to content

Commit

Permalink
QMAKE_POST_LINK doesn't work in Qt 5.5. (#10)
Browse files Browse the repository at this point in the history 
Replace QMAKE_POST_LINK with more extensive usage of INSTALLS.
  • Loading branch information
@grayed
grayed authored May 6, 2020
1 parent 050193c commit e1b6ac5
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions qmltermwidget.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ OTHER_FILES += \
test-app/test-app.qml \
src/qmldir

# Copy the files useful to the plugin in DESTDIR
QMAKE_POST_LINK = $(COPY_DIR) $$PWD/lib/color-schemes $$DESTDIR && \
$(COPY_DIR) $$PWD/lib/kb-layouts $$DESTDIR && \
$$QMAKE_COPY $$PWD/src/qmldir $$DESTDIR && \
$$QMAKE_COPY $$PWD/src/QMLTermScrollbar.qml $$DESTDIR

#########################################
## INTALLS
#########################################
Expand All @@ -49,4 +43,17 @@ assets.path += $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH
qmldir.files += $$PWD/src/qmldir
qmldir.path += $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH

INSTALLS += target qmldir assets
colorschemes.files = $$PWD/lib/color-schemes/*
colorschemes.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/color-schemes
colorschemes2.files = $$PWD/lib/color-schemes/historic/*
colorschemes2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/color-schemes/historic

kblayouts.files = $$PWD/lib/kb-layouts/*
kblayouts.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts
kblayouts2.files = $$PWD/lib/kb-layouts/historic/*
kblayouts2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts/historic

This comment has been minimized.

Sign in to view

Copy link
@shr-project

shr-project May 15, 2020

This seems to be causing install failures (at least with Qt 5.15)
Error copying /OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/qmltermwidget/0.14.1+gitAUTOINC+59f967d5e1-r0/git/lib/kb-layouts/historic/vt100.keytab to /OE/build/luneos-master/webos-ports/tmp-glibc/work/core2-64-webos-linux/qmltermwidget/0.14.1+gitAUTOINC+59f967d5e1-r0/image/usr/lib/qml/QMLTermWidget/kb-layouts/historic/vt100.keytab: Destination file exists

This comment has been minimized.

Sign in to view

Copy link
@shr-project

shr-project May 15, 2020

Removing this whole section works for me and the files are still installed, by:

assets.files += $$PLUGIN_ASSETS
assets.path += $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH

above

This comment has been minimized.

Sign in to view

Copy link
@shr-project

shr-project May 16, 2020

I've created PR to fix this:
#30
tested only with Qt 5.15

scrollbar.files = $$PWD/src/QMLTermScrollbar.qml
scrollbar.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH

INSTALLS += target qmldir assets colorschemes colorschemes2 kblayouts kblayouts2 scrollbar

0 comments on commit e1b6ac5

Please sign in to comment.