r24638 by craig - Better version fix

[scribus-commit]

Author: craig
Date: Sun Apr 25 14:57:49 2021
New Revision: 24638

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24638
Log:
Better version fix

Modified:
    trunk/Scribus/scribus/api/api_application.cpp
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/scribus/api/api_application.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24638&path=/trunk/Scribus/scribus/api/api_application.cpp
==============================================================================
--- trunk/Scribus/scribus/api/api_application.cpp       (original)
+++ trunk/Scribus/scribus/api/api_application.cpp       Sun Apr 25 14:57:49 2021
@@ -131,7 +131,7 @@
        QString getSVNRevision()
        {
 #if defined(HAVE_SVNVERSION) && defined(SVNVERSION)
-//             if (isSVN())
+               if (isSVN())
                        return QString("%1").arg(SVNVERSION);
 #endif
                return QString();

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24638&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp  (original)
+++ trunk/Scribus/scribus/ui/about.cpp  Sun Apr 25 14:57:49 2021
@@ -141,7 +141,7 @@
        if (BUILD_NAME == "BleedingEdge")
                built = tr("%3-%2-%1 %4 %5").arg(BUILD_DAY, BUILD_MONTH, 
BUILD_YEAR, BUILD_TIME, BUILD_TZ);
 
-       if (ScribusAPI::haveSVNRevision())
+       if (ScribusAPI::isSVN() && ScribusAPI::haveSVNRevision())
        {
                QString revText(tr("SVN Revision: "));
                revText += ScribusAPI::getSVNRevision();


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit