diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index b7fa32a..62b0298 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,9 +1,11 @@ { "ExpandedNodes": [ "", - "\\doc", - "\\src" + "\\src", + "\\src\\qt", + "\\src\\qt\\res", + "\\src\\qt\\res\\icons" ], - "SelectedNode": "\\doc\\build-msw.txt", + "SelectedNode": "\\Enviromint-qt.pro", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/enviromint/v15/.suo b/.vs/enviromint/v15/.suo index 13f7e6b..fb6a319 100644 Binary files a/.vs/enviromint/v15/.suo and b/.vs/enviromint/v15/.suo differ diff --git a/.vs/enviromint/v15/Browse.VC.db b/.vs/enviromint/v15/Browse.VC.db index bddadda..a0827c0 100644 Binary files a/.vs/enviromint/v15/Browse.VC.db and b/.vs/enviromint/v15/Browse.VC.db differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index a836fa9..c927f76 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Enviromint-qt.pro b/Enviromint-qt.pro index 13f4052..80935ea 100644 --- a/Enviromint-qt.pro +++ b/Enviromint-qt.pro @@ -414,7 +414,7 @@ INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$ LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX # -lgdi32 has to happen after -lcrypto (see #681) -windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 +windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 -pthread LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX diff --git a/src/qt/res/icons/enviromint-128.png b/src/qt/res/icons/enviromint-128.png new file mode 100644 index 0000000..5099418 Binary files /dev/null and b/src/qt/res/icons/enviromint-128.png differ diff --git a/src/qt/res/icons/enviromint-16.png b/src/qt/res/icons/enviromint-16.png new file mode 100644 index 0000000..c28a838 Binary files /dev/null and b/src/qt/res/icons/enviromint-16.png differ diff --git a/src/qt/res/icons/enviromint-32.png b/src/qt/res/icons/enviromint-32.png new file mode 100644 index 0000000..11c30f7 Binary files /dev/null and b/src/qt/res/icons/enviromint-32.png differ diff --git a/src/qt/res/icons/enviromint-48.png b/src/qt/res/icons/enviromint-48.png new file mode 100644 index 0000000..5115083 Binary files /dev/null and b/src/qt/res/icons/enviromint-48.png differ diff --git a/src/qt/res/icons/enviromint-80.png b/src/qt/res/icons/enviromint-80.png new file mode 100644 index 0000000..df40352 Binary files /dev/null and b/src/qt/res/icons/enviromint-80.png differ diff --git a/src/qt/res/icons/enviromint.ico b/src/qt/res/icons/enviromint.ico new file mode 100644 index 0000000..d9ee854 Binary files /dev/null and b/src/qt/res/icons/enviromint.ico differ diff --git a/src/qt/res/icons/enviromint.png b/src/qt/res/icons/enviromint.png new file mode 100644 index 0000000..b6b4cb5 Binary files /dev/null and b/src/qt/res/icons/enviromint.png differ