diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-15 08:33:10 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-15 08:33:10 -0700 |
| commit | b68a8a6b34c22f08478c042352209db0ff7fac60 (patch) | |
| tree | 086eaa276ff3b7dc72fc72cb20317f92556c67ce /bitcoin-qt.pro | |
| parent | 755e2819b059d3e9d8148c4802c6f12e7af3fad5 (diff) | |
| parent | d85f2458007ba8f7558220a99fe1dd03abd74307 (diff) | |
Merge pull request #583 from laanwj/qt3
More Qt GUI updates
- Make USE_SSL qmake build flag actually work
- Improve mac experience, general UI improvements
- Add keyboard shortcut to switch between tabs
Diffstat (limited to 'bitcoin-qt.pro')
| -rw-r--r-- | bitcoin-qt.pro | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 8a735a7cca..2e4000e52a 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -17,10 +17,17 @@ OBJECTS_DIR = build MOC_DIR = build UI_DIR = build -# use: qmake "USE_UPNP=0" (disable by default) or "USE_UPNP=1" (enable by default) -# miniupnpc (http://miniupnp.free.fr/files/) must be installed -count(USE_UPNP, 1) { +# use: qmake "USE_UPNP=1" ( enabled by default; default) +# or: qmake "USE_UPNP=0" (disabled by default) +# or: qmake "USE_UPNP=-" (not supported) +# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support +contains(USE_UPNP, -) { + message(Building without UPNP support) +} else { message(Building with UPNP support) + count(USE_UPNP, 0) { + USE_UPNP=1 + } DEFINES += USE_UPNP=$$USE_UPNP LIBS += -lminiupnpc } @@ -33,7 +40,7 @@ contains(USE_DBUS, 1) { } # use: qmake "USE_SSL=1" -contains(USE_DBUS, 1) { +contains(USE_SSL, 1) { message(Building with SSL support for RPC) DEFINES += USE_SSL } @@ -221,6 +228,9 @@ windows:LIBS += -lws2_32 -lgdi32 windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc +macx:HEADERS += src/qt/macdockiconhandler.h +macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm +macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 macx:ICON = src/qt/res/icons/bitcoin.icns macx:TARGET = "Bitcoin-Qt" |