diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-05-12 00:48:46 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-05-12 00:48:46 -0700 |
| commit | 4830ff923ea2bbd36fb90789dcdfef33aca7cbf4 (patch) | |
| tree | 4460a65813eeb5da806206bad77c9a22beb65e3d | |
| parent | Merge pull request #1261 from laanwj/2012_05_escapecsv (diff) | |
| parent | Speed up build in Qt creator in common case (diff) | |
| download | discoin-4830ff923ea2bbd36fb90789dcdfef33aca7cbf4.tar.xz discoin-4830ff923ea2bbd36fb90789dcdfef33aca7cbf4.zip | |
Merge pull request #1265 from laanwj/2012_05_fixredundantbuild
Speed up build in Qt creator in common case
| -rw-r--r-- | bitcoin-qt.pro | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index bc557bc1e..6a9dad4ac 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -84,8 +84,8 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { !windows || contains(USE_BUILD_INFO, 1) { genbuild.depends = FORCE genbuild.commands = cd $$PWD; share/genbuild.sh $$OUT_PWD/build/build.h - genbuild.target = genbuildhook - PRE_TARGETDEPS += genbuildhook + genbuild.target = $$OUT_PWD/build/build.h + PRE_TARGETDEPS += $$OUT_PWD/build/build.h QMAKE_EXTRA_TARGETS += genbuild DEFINES += HAVE_BUILD_INFO } @@ -259,15 +259,14 @@ isEmpty(QMAKE_LRELEASE) { win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease } -isEmpty(TS_DIR):TS_DIR = src/qt/locale +isEmpty(QM_DIR):QM_DIR = $$PWD/src/qt/locale # automatically build translations, so they can be included in resource file TSQM.name = lrelease ${QMAKE_FILE_IN} TSQM.input = TRANSLATIONS -TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm -TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} +TSQM.output = $$QM_DIR/${QMAKE_FILE_BASE}.qm +TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} TSQM.CONFIG = no_link QMAKE_EXTRA_COMPILERS += TSQM -PRE_TARGETDEPS += compiler_TSQM_make_all # "Other files" to show in Qt Creator OTHER_FILES += \ |