Skip to content

Commit

Permalink
some missing version updates
Browse files Browse the repository at this point in the history
  • Loading branch information
aknoerig committed Apr 21, 2016
1 parent 5c895d3 commit b91c862
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
8 changes: 4 additions & 4 deletions FritzingInfo.plist
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
<!--
*************************************************
Part of the Fritzing project - http://fritzing.org
Copyright (c) 2007-15 Fritzing
Expand All @@ -22,7 +22,7 @@ $Revision: 2063 $:
$Author: cohen@irascible.com $:
$Date: 2009-01-03 18:55:48 +0100 (Sat, 03 Jan 2009) $
******************************************************
******************************************************
-->

<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
Expand All @@ -33,9 +33,9 @@ $Date: 2009-01-03 18:55:48 +0100 (Sat, 03 Jan 2009) $
<key>CFBundleExecutable</key>
<string>Fritzing</string>
<key>CFBundleGetInfoString</key>
<string>Fritzing 0.9.2</string>
<string>Fritzing 0.9.3</string>
<key>CFBundleShortVersionString</key>
<string>0.9.2</string>
<string>0.9.3</string>
<key>CFBundleVersion</key>
<string>bda4e</string>
<key>CFBundleIconFile</key>
Expand Down
12 changes: 6 additions & 6 deletions fritzing.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ IDI_ICON1 ICON DISCARDABLE "resources/images/fritzing_icon.

#include <windows.h>

#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"
Expand Down Expand Up @@ -44,4 +44,4 @@ BEGIN
BEGIN
VALUE "Translation", 0x409, 1252
END
END
END
36 changes: 18 additions & 18 deletions src/version/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License
along with Fritzing. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************
$Revision: 9268 $:
$Author: irascibl@gmail.com $:
$Date: 2014-06-11 17:47:21 +0200 (We, 11. Jun 2013) $
********************************************************************/

#include "version.h"

#include <QString>
#include <QStringList>
#include <QSettings>
#include <QUrl>
#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" << "";
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit b91c862

Please sign in to comment.