Merge pull request #2240

35a0f25 PasswordDialog: merge components and bug fixes (selsta)

monero-wallet-gui.pro

@@ -68,7 +68,8 @@ HEADERS += \
     src/qt/mime.h \
     src/qt/KeysFiles.h \
     src/qt/utils.h \
-    src/qt/prices.h
+    src/qt/prices.h \
+    src/qt/macoshelper.h
 
 SOURCES += main.cpp \
     filter.cpp \
@@ -334,7 +335,8 @@ linux {
         -llmdb \
         -lsodium \
         -lhidapi-libusb \
-        -lcrypto $$TREZOR_LINKER
+        -lcrypto $$TREZOR_LINKER \
+        -lX11
 
     if(!android) {
         LIBS+= \
@@ -359,6 +361,8 @@ macx {
     #     message("using static libraries")
     #     LIBS+= -Wl,-Bstatic
     # }
+    QT += macextras
+    OBJECTIVE_SOURCES += src/qt/macoshelper.mm
     LIBS+= \
         -L/usr/local/lib \
         -L/usr/local/opt/openssl/lib \
@@ -372,6 +376,7 @@ macx {
         -lboost_chrono \
         -lboost_program_options \
         -framework CoreFoundation \
+        -framework AppKit \
         -lhidapi \
         -lssl \
         -lsodium \