diff --git a/.gitignore b/.gitignore
index d76135b5aa09d..e43110c4238a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,7 @@ src/qt/test/moc*.cpp
*.qm
Makefile
mastercore-qt
-Bitcoin-Qt.app
+MasterCore-Qt.app
# Unit-tests
Makefile.test
diff --git a/Makefile.am b/Makefile.am
index 17bc1390d1ce1..63939925041a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,8 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/mastercore-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/mastercore-cli$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
-OSX_APP=Bitcoin-Qt.app
-OSX_DMG=Bitcoin-Qt.dmg
+OSX_APP=MasterCore-Qt.app
+OSX_DMG=MasterCore-Qt.dmg
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
@@ -72,13 +72,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@
-$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
+$(OSX_APP)/Contents/MacOS/MasterCore-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
- $(OSX_APP)/Contents/MacOS/Bitcoin-Qt
+ $(OSX_APP)/Contents/MacOS/MasterCore-Qt
if BUILD_DARWIN
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
@@ -91,7 +91,7 @@ $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(INSTALL) contrib/macdeploy/background.png dist/.background
$(INSTALL) contrib/macdeploy/DS_Store dist/.DS_Store
cd dist; $(LN_S) /Applications Applications
- $(GENISOIMAGE) -no-cache-inodes -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
+ $(GENISOIMAGE) -no-cache-inodes -l -probe -V "MasterCore-Qt" -no-pad -r -apple -o $@ dist
endif
if TARGET_DARWIN
diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist
index e73b9b697ef9f..11803ba956d2a 100644
--- a/contrib/macdeploy/fancy.plist
+++ b/contrib/macdeploy/fancy.plist
@@ -22,7 +22,7 @@
370
156
- Bitcoin-Qt.app
+ MasterCore-Qt.app
128
156
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 5c310df1fce9e..d071b404b39b0 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -217,7 +217,15 @@ def getFrameworks(binaryPath, verbose):
if verbose >= 3:
print "Found framework:"
print info
- libraries.append(info)
+#
+# Workaround for build issue (MSG 2014-09-28)
+#
+ if info.frameworkName != "libboost_system-mt.dylib":
+ print "** About to append framework named: " + info.frameworkName
+ libraries.append(info)
+ else:
+ print "** Skipping framework named: " + info.frameworkName
+
return libraries
@@ -785,7 +793,7 @@ if config.dmg is not None:
items_positions.append(itemscript.substitute(params))
params = {
- "disk" : "Bitcoin-Qt",
+ "disk" : "MasterCore-Qt",
"window_bounds" : "300,300,800,620",
"icon_size" : "96",
"background_commands" : "",
diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index e79e59a568feb..92cbfee6dd30c 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -29,10 +29,10 @@
????
CFBundleExecutable
- Bitcoin-Qt
+ MasterCore-Qt
CFBundleIdentifier
- org.bitcoinfoundation.Bitcoin-Qt
+ org.mastercoin.MasterCore-Qt
CFBundleURLTypes
diff --git a/src/mastercore.cpp b/src/mastercore.cpp
index 7d45fec89a8c7..4b02b477ba76e 100644
--- a/src/mastercore.cpp
+++ b/src/mastercore.cpp
@@ -2183,7 +2183,7 @@ int mastercore_init()
}
printf("%s()%s, line %d, file: %s\n", __FUNCTION__, isNonMainNet() ? "TESTNET":"", __LINE__, __FILE__);
- ShrinkMasterCoreDebugFile();
+// ShrinkMasterCoreDebugFile();
#ifndef DISABLE_LOG_FILE
boost::filesystem::path pathTempLog = GetDataDir() / LOG_FILENAME;
diff --git a/src/qt/sendmpdialog.cpp b/src/qt/sendmpdialog.cpp
index 7a187b0232751..3a11a4fe86dd0 100644
--- a/src/qt/sendmpdialog.cpp
+++ b/src/qt/sendmpdialog.cpp
@@ -72,7 +72,6 @@ SendMPDialog::SendMPDialog(QWidget *parent) :
this->model = model;
#ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
- ui->addButton->setIcon(QIcon());
ui->clearButton->setIcon(QIcon());
ui->sendButton->setIcon(QIcon());
#endif