diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-12-16 11:15:40 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-12-16 11:15:41 +0100 |
| commit | bb3c75bdf48cf04f97fa84f494f7366fac99e379 (patch) | |
| tree | 5296d36bb6221baf8ec222e102afdd9d8dcbbe60 /src/Makefile.qt.include | |
| parent | Merge pull request #5219 (diff) | |
| parent | resize tray icon because a 1024x1024 icon won't show in ubuntu (bug) (diff) | |
| download | discoin-bb3c75bdf48cf04f97fa84f494f7366fac99e379.tar.xz discoin-bb3c75bdf48cf04f97fa84f494f7366fac99e379.zip | |
Merge pull request #5228
ac23394 resize tray icon because a 1024x1024 icon won't show in ubuntu (bug) (Jonas Schnelli)
8e76ca0 Qt: Go back to using QIcon functionality for scaling (Wladimir J. van der Laan)
54f2571 Qt: HiDPI (retina) support for splash screen (Jonas Schnelli)
Diffstat (limited to 'src/Makefile.qt.include')
| -rw-r--r-- | src/Makefile.qt.include | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 4c455483a..25d76c146 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -216,8 +216,6 @@ RES_ICONS = \ qt/res/icons/about_qt.png \ qt/res/icons/bitcoin.ico \ qt/res/icons/bitcoin.png \ - qt/res/icons/bitcoin_testnet.ico \ - qt/res/icons/bitcoin_testnet.png \ qt/res/icons/clock1.png \ qt/res/icons/clock2.png \ qt/res/icons/clock3.png \ @@ -315,9 +313,7 @@ BITCOIN_QT_CPP += \ endif RES_IMAGES = \ - qt/res/images/about.png \ - qt/res/images/splash.png \ - qt/res/images/splash_testnet.png + qt/res/images/about.png RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) @@ -371,7 +367,7 @@ qt_bitcoin_qt_LIBTOOLFLAGS = --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) -.SECONDARY: $(QT_QM) +SECONDARY: $(QT_QM) qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" |