Skip to content

Commit

Permalink
Merge PR #2771: rcc.pri: Fix script path for MinGW on Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
mkrautz committed Jan 25, 2017
2 parents 8fc69fe + a4b1f8a commit 7e1fdaa
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions rcc.pri
Expand Up @@ -13,6 +13,9 @@
# We have to do this because we're loading the
# 'resources' feature a bit earlier than usual.
# By default, Qt would have set these itself.

include(python.pri)

CONFIG(debug, debug|release) {
RCC_DIR = debug
}
Expand All @@ -22,11 +25,5 @@ CONFIG(release, debug|release) {

load(resources)

win32 {
WINPWD = $$shell_path($${PWD})
RCC_DEPENDS = $$escape_expand(\")$${WINPWD}\\scripts\\rcc-depends.py$$escape_expand(\")
rcc.depend_command = python $${RCC_DEPENDS} ${QMAKE_FILE_IN}
} else {
RCC_DEPENDS = $$escape_expand(\")$${PWD}/scripts/rcc-depends.py$$escape_expand(\")
rcc.depend_command = $${RCC_DEPENDS} ${QMAKE_FILE_IN}
}
RCC_DEPENDS = $$escape_expand(\")$${PWD}/scripts/rcc-depends.py$$escape_expand(\")
rcc.depend_command = $${PYTHON} $${RCC_DEPENDS} ${QMAKE_FILE_IN}

0 comments on commit 7e1fdaa

Please sign in to comment.