Skip to content

Commit

Permalink
Updated versions and about dialog for QT
Browse files Browse the repository at this point in the history
  • Loading branch information
labuser committed May 6, 2014
1 parent 7f6e0e2 commit cfe890d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 8 deletions.
17 changes: 16 additions & 1 deletion asiacoin-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,25 @@ VERSION = 1.8.2
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
CONFIG += no_include_pwd
CONFIG += thread
CONFIG += static

# UNCOMMENT THIS SECTION TO BUILD ON WINDOWS
# Change paths if needed, these use the foocoin/deps.git repository locations

# Dependency library locations can be customized with:
# BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
# BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively

BOOST_LIB_SUFFIX=-mgw48-mt-s-1_55
BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1g/include
OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1g
MINIUPNPC_INCLUDE_PATH=C:/deps/
MINIUPNPC_LIB_PATH=C:/deps/miniupnpc

OBJECTS_DIR = build
MOC_DIR = build
Expand All @@ -32,7 +47,7 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
}
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat -static

# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
Expand Down
11 changes: 6 additions & 5 deletions src/qt/forms/aboutdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string notr="true">0.3.666-beta</string>
<string notr="true">v1.8.2.0</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
Expand Down Expand Up @@ -94,7 +94,7 @@
<string>
Copyright © 2009-2012 Bitcoin Developers
Copyright © 2012 PPCoin Developers
Copyright © 2014 AsiaCoin Developers
Copyright © 2014 AsiaCoinFix Developers
</string>
</property>
<property name="textInteractionFlags">
Expand All @@ -109,11 +109,12 @@ Copyright © 2014 AsiaCoin Developers
</property>
<property name="text">
<string>
This is experimental software. If you don't treat it as such, you're likely to put an eye out!

Please see this thread : https://bitcointalk.org/index.php?topic=595999.0
Website : http://www.thecoin.asia

Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.

This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</string>
This product includes software developed by the OpenSSL 1.0.1g (heartbleed patched) Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
4 changes: 2 additions & 2 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ static const int BIP0031_VERSION = 60000;
static const int MEMPOOL_GD_VERSION = 60002;

#define DISPLAY_VERSION_MAJOR 1
#define DISPLAY_VERSION_MINOR 0
#define DISPLAY_VERSION_REVISION 0
#define DISPLAY_VERSION_MINOR 8
#define DISPLAY_VERSION_REVISION 2
#define DISPLAY_VERSION_BUILD 0

#endif

0 comments on commit cfe890d

Please sign in to comment.