From b91c8629fdc45c2f4951c3385dcea108e30b3d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Kn=C3=B6rig?= Date: Thu, 21 Apr 2016 09:56:57 +0200 Subject: [PATCH] some missing version updates --- FritzingInfo.plist | 8 ++++---- fritzing.rc | 12 ++++++------ src/version/version.cpp | 36 ++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/FritzingInfo.plist b/FritzingInfo.plist index a7fe5f56a..4ccf6d5e3 100644 --- a/FritzingInfo.plist +++ b/FritzingInfo.plist @@ -1,6 +1,6 @@ - @@ -33,9 +33,9 @@ $Date: 2009-01-03 18:55:48 +0100 (Sat, 03 Jan 2009) $ CFBundleExecutable Fritzing CFBundleGetInfoString - Fritzing 0.9.2 + Fritzing 0.9.3 CFBundleShortVersionString - 0.9.2 + 0.9.3 CFBundleVersion bda4e CFBundleIconFile diff --git a/fritzing.rc b/fritzing.rc index ec6b07bfc..6f86b6818 100644 --- a/fritzing.rc +++ b/fritzing.rc @@ -2,16 +2,16 @@ IDI_ICON1 ICON DISCARDABLE "resources/images/fritzing_icon. #include -#define VER_FILEVERSION 0,9,2,0 -#define VER_FILEVERSION_STR "0.9.2b\0" +#define VER_FILEVERSION 0,9,3,0 +#define VER_FILEVERSION_STR "0.9.3b\0" -#define VER_PRODUCTVERSION 0,9,2,0 -#define VER_PRODUCTVERSION_STR "0.9.2b\0" +#define VER_PRODUCTVERSION 0,9,3,0 +#define VER_PRODUCTVERSION_STR "0.9.3b\0" #define VER_COMPANYNAME_STR "Fritzing" #define VER_FILEDESCRIPTION_STR "Fritzing" #define VER_INTERNALNAME_STR "Fritzing" -#define VER_LEGALCOPYRIGHT_STR "Copyright © 2007-2016 Fritzing" +#define VER_LEGALCOPYRIGHT_STR "Copyright � 2007-2016 Fritzing" #define VER_LEGALTRADEMARKS1_STR "All Rights Reserved" #define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR #define VER_ORIGINALFILENAME_STR "Fritzing.exe" @@ -44,4 +44,4 @@ BEGIN BEGIN VALUE "Translation", 0x409, 1252 END -END \ No newline at end of file +END diff --git a/src/version/version.cpp b/src/version/version.cpp index 83778fafd..8e5d60ec4 100644 --- a/src/version/version.cpp +++ b/src/version/version.cpp @@ -11,47 +11,47 @@ the Free Software Foundation, either version 3 of the License, or Fritzing is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty ofswap MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Fritzing. If not, see . -You should have received a copy of the GNU General Public License -along with Fritzing. If not, see . - ********************************************************************* - + $Revision: 9268 $: $Author: irascibl@gmail.com $: $Date: 2014-06-11 17:47:21 +0200 (We, 11. Jun 2013) $ ********************************************************************/ - + #include "version.h" - + #include #include #include #include - -#include "../debugdialog.h" -#include "../utils/textutils.h" + +#include "../debugdialog.h" +#include "../utils/textutils.h" #include "../lib/qtsysteminfo/QtSystemInfo.h" -QString Version::m_majorVersion("0"); +QString Version::m_majorVersion("0"); QString Version::m_minorVersion("9"); QString Version::m_minorSubVersion("3"); QString Version::m_modifier("b"); -QString Version::m_gitCommit("c14606e062d20225b274942d588389e6fe6bc240"); -QString Version::m_gitDate("2016-01-28T14:36:55Z"); // want standard ISO form +QString Version::m_gitCommit("5c895d327c44a3114e5fcc9d8260daf0cbb52806"); +QString Version::m_gitDate("2016-04-19T21:25:37Z"); // want standard ISO form QString Version::m_revision; QString Version::m_date; QString Version::m_shortDate; QString Version::m_versionString; QString Version::m_year; -QStringList Version::m_modifiers; +QStringList Version::m_modifiers; + +Version * Version::m_singleton = new Version(); -Version * Version::m_singleton = new Version(); +QString Version::FirstVersionWithDetachedUserData = "0.3.1b.05.26.3016"; -QString Version::FirstVersionWithDetachedUserData = "0.3.1b.05.26.3016"; - Version::Version() { if (m_modifiers.count() == 0) { m_modifiers << "a" << "b" << "rc" << ""; @@ -121,7 +121,7 @@ bool Version::candidateGreaterThanCurrent(const VersionThing & candidateVersionT myVersionThing.minorSubVersion = minorSubVersion().toInt(); myVersionThing.releaseModifier = modifier(); - return greaterThan(myVersionThing, candidateVersionThing); + return greaterThan(myVersionThing, candidateVersionThing); } bool Version::greaterThan(const QString & myVersionStr, const QString & yourVersionStr) {