diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-04-06 18:43:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 09:44:39 +0200 |
| commit | 379ba861ec3b11f0aef94eafab6de8ea481a8bd8 (patch) | |
| tree | 51edf6d0613a934d5dc6724f968fdc6f7b82e346 /examples/exampleresources | |
| parent | e8f62082071c59ba02d1ab01bda74063c75093fc (diff) | |
Fix shadow builds on unix systems
Change-Id: Ibbe253bd0470d92c09b3dfded8d3f8fb91af88da
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/exampleresources')
| -rw-r--r-- | examples/exampleresources/exampleresources.pri | 3 | ||||
| -rw-r--r-- | examples/exampleresources/exampleresources.pro | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/examples/exampleresources/exampleresources.pri b/examples/exampleresources/exampleresources.pri index c97abf078..f12283b0c 100644 --- a/examples/exampleresources/exampleresources.pri +++ b/examples/exampleresources/exampleresources.pri @@ -1,2 +1,3 @@ INCLUDEPATH += $$PWD -LIBS += $$PWD/libexampleresources.a
\ No newline at end of file +# TODO: Fix lib name for windows +LIBS += $$shadowed($$PWD)/libexampleresources.a diff --git a/examples/exampleresources/exampleresources.pro b/examples/exampleresources/exampleresources.pro index ea0d48b80..7cf8577cb 100644 --- a/examples/exampleresources/exampleresources.pro +++ b/examples/exampleresources/exampleresources.pro @@ -12,11 +12,12 @@ DEFINES += ASSETS=$$shadowed($$PWD)/ # We can't use RESOURCES here, as the resources are not in a subdir, # of each example # +load(resources) RCC_BINARY_SOURCES += example-assets.qrc -asset_builder.commands = $$[QT_HOST_BINS]/rcc -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -asset_builder.depend_command = $$[QT_HOST_BINS]/rcc -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} +asset_builder.commands = $$QMAKE_RCC -binary ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} +asset_builder.depend_command = $$QMAKE_RCC_DEP -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} asset_builder.input = RCC_BINARY_SOURCES -asset_builder.output = $$OUT_PWD/${QMAKE_FILE_IN_BASE}.qrb +asset_builder.output = $$shadowed($$OUT_PWD)/${QMAKE_FILE_IN_BASE}.qrb asset_builder.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += asset_builder |