Merge branch 'master' of https://github.com/DreamSourceLab/DSView

2018-07-08 18:22:57 +08:00
parent 856e1803a7 f65cca30b2
commit 93aea7bd9f
5 changed files with 513 additions and 180 deletions
--- a/DSView/pv/dialogs/about.cpp
+++ b/DSView/pv/dialogs/about.cpp
@@ -44,6 +44,8 @@ About::About(QWidget *parent) :
        QString arch = "x64";
    #elif defined(__i386) || defined(_M_IX86)
        QString arch = "x86";
+    #elif defined(__arm__) || defined(_M_ARM)
+        QString arch = "arm";
    #endif

    QString version = tr("<font size=24>DSView %1 (%2)</font><br />")