Browse Source

updated installer to qt5 & mingw

gwillz 6 years ago
parent
commit
366fa41a89

+ 12 - 31
install.nsi

@@ -10,9 +10,9 @@ VIAddVersionKey "CompanyName" "GwillzCorp"
 VIAddVersionKey "LegalTrademarks" "Licensed under GPL 3.0"
 VIAddVersionKey "LegalCopyright" "© Gwilyn Saunders"
 VIAddVersionKey "FileDescription" "Setup installer for PhotoBunny"
-VIAddVersionKey "FileVersion" "1.3"
-VIAddVersionKey "ProductVersion" "1.3.0.2"
-VIProductVersion "1.3.0.2"
+VIAddVersionKey "FileVersion" "1.4"
+VIAddVersionKey "ProductVersion" "1.4.0.4"
+VIProductVersion "1.4.0.4"
 
 LicenseData "installer\GPL3.txt"
 DirText "Select somewhere to install and junk"
@@ -34,28 +34,14 @@ Section "Common Files (Required)"
 	
 	#copy files
 	File "installer\photobunny.exe"
-	File "installer\QtCore4.dll"
-	File "installer\QtGui4.dll"
-	File "installer\QtNetwork4.dll"
-	File "installer\QtWebKit4.dll"
-	File "installer\qjson.dll"
-	File "installer\libeay32.dll"
-	File "installer\ssleay32.dll"
-	File "installer\vcredist_sp1_x86.exe"
-	File "installer\GPL3.txt"
+	File /r "installer\*.dll"
+	File "installer\GPL3.txt"
 	CreateDirectory "$INSTDIR\imageformats"
 	SetOutPath "$INSTDIR\imageformats"
-	File "installer\qjpeg4.dll"
-	
-	#Check for 32bit VC2010 on a 32bit system
-	ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
-	${If} $0 == ""
-		#then check on a 64bit system
-		ReadRegDWORD $1 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
-		${If} $1 == ""
-			ExecWait "$INSTDIR\vcredist_sp1_x86.exe"
-		${EndIf}
-	${EndIf}
+    File /r "installer\imageformats\*"
+    CreateDirectory "$INSTDIR\imageformats"
+	SetOutPath "$INSTDIR\imageformats"
+    File /r "installer\platforms\*"
 	
 	#create uninstaller
 	WriteUninstaller "$INSTDIR\uninstall.exe"
@@ -70,16 +56,11 @@ SectionEnd
 Section "Uninstall"
 	#remove program files
 	Delete "$INSTDIR\photobunny.exe"
-	Delete "$INSTDIR\QtCore4.dll"
-	Delete "$INSTDIR\QtGui4.dll"
-	Delete "$INSTDIR\QtNetwork4.dll"
-	Delete "$INSTDIR\QtWebKit4.dll"
-	Delete "$INSTDIR\qjson.dll"
-	Delete "$INSTDIR\libeay32.dll"
-	Delete "$INSTDIR\ssleay32.dll"
+	Delete "$INSTDIR\*.dll"
 	Delete "$INSTDIR\GPL3.txt"
 	Delete "$INSTDIR\uninstall.exe"
-	Delete "$INSTDIR\imageformats\qjpeg4.dll"
+	Delete "$INSTDIR\imageformats\*"
+    Delete "$INSTDIR\platforms\*"
 	
 	#remove shortcut files
 	Delete "$SMPROGRAMS\PhotoBunny\PhotoBunny.lnk"

BIN
installer/Qt5Core.dll


BIN
installer/Qt5Gui.dll


BIN
installer/Qt5Multimedia.dll


BIN
installer/Qt5MultimediaWidgets.dll


BIN
installer/Qt5Network.dll


BIN
installer/Qt5OpenGL.dll


BIN
installer/Qt5Positioning.dll


BIN
installer/Qt5PrintSupport.dll


BIN
installer/Qt5Qml.dll


BIN
installer/Qt5Quick.dll


BIN
installer/Qt5Sensors.dll


BIN
installer/Qt5Sql.dll


BIN
installer/Qt5Svg.dll


BIN
installer/Qt5WebKit.dll


BIN
installer/Qt5WebKitWidgets.dll


BIN
installer/Qt5Widgets.dll


BIN
installer/QtCore4.dll


BIN
installer/QtGui4.dll


BIN
installer/QtNetwork4.dll


BIN
installer/QtWebKit4.dll


BIN
installer/icudt52.dll


BIN
installer/icuin52.dll


BIN
installer/icuuc52.dll


BIN
installer/imageformats/qjpeg.dll


+ 0 - 0
installer/libeay32.dll


BIN
installer/libgcc_s_dw2-1.dll


BIN
installer/libstdc++-6.dll


BIN
installer/libwinpthread-1.dll


BIN
installer/photobunny.exe


BIN
installer/platforms/qwindows.dll


BIN
installer/qjpeg.dll


BIN
installer/qjpeg4.dll


BIN
installer/qjson.dll


BIN
installer/vcredist_sp1_x86.exe


+ 0 - 99
qjson/parser.h

@@ -1,99 +0,0 @@
-/* This file is part of QJson
- *
- * Copyright (C) 2008 Flavio Castelli <flavio.castelli@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- * 
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef QJSON_PARSER_H
-#define QJSON_PARSER_H
-
-#include "qjson_export.h"
-
-QT_BEGIN_NAMESPACE
-class QIODevice;
-class QVariant;
-QT_END_NAMESPACE
-
-/**
- * Namespace used by QJson
- */
-namespace QJson {
-
-  class ParserPrivate;
-
-  /**
-   * @brief Main class used to convert JSON data to QVariant objects
-   */
-  class QJSON_EXPORT Parser
-  {
-    public:
-      Parser();
-      ~Parser();
-
-      /**
-      * Read JSON string from the I/O Device and converts it to a QVariant object
-      * @param io Input output device
-      * @param ok if a conversion error occurs, *ok is set to false; otherwise *ok is set to true.
-      * @returns a QVariant object generated from the JSON string
-      */
-      QVariant parse(QIODevice* io, bool* ok = 0);
-
-      /**
-      * This is a method provided for convenience.
-      * @param jsonData data containing the JSON object representation
-      * @param ok if a conversion error occurs, *ok is set to false; otherwise *ok is set to true.
-      * @returns a QVariant object generated from the JSON string
-      * @sa errorString
-      * @sa errorLine
-      */
-      QVariant parse(const QByteArray& jsonData, bool* ok = 0);
-
-      /**
-      * This method returns the error message
-      * @returns a QString object containing the error message of the last parse operation
-      * @sa errorLine
-      */
-      QString errorString() const;
-
-      /**
-      * This method returns line number where the error occurred
-      * @returns the line number where the error occurred
-      * @sa errorString
-      */
-      int errorLine() const;
-
-      /**
-       * Sets whether special numbers (Infinity, -Infinity, NaN) are allowed as an extension to
-       * the standard
-       * @param  allowSpecialNumbers new value of whether special numbers are allowed
-       * @sa specialNumbersAllowed
-       */
-      void allowSpecialNumbers(bool allowSpecialNumbers);
-
-      /**
-       * @returns whether special numbers (Infinity, -Infinity, NaN) are allowed
-       * @sa allowSpecialNumbers
-       */
-      bool specialNumbersAllowed() const;
-
-    private:
-      Q_DISABLE_COPY(Parser)
-      ParserPrivate* const d;
-  };
-}
-
-#endif // QJSON_PARSER_H

+ 0 - 64
qjson/parserrunnable.h

@@ -1,64 +0,0 @@
-/* This file is part of qjson
-  *
-  * Copyright (C) 2009 Flavio Castelli <flavio@castelli.name>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-  * License version 2.1, as published by the Free Software Foundation.
-  * 
-  *
-  * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public License
-  * along with this library; see the file COPYING.LIB.  If not, write to
-  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
-
-#ifndef PARSERRUNNABLE_H
-#define PARSERRUNNABLE_H
-
-#include "qjson_export.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QRunnable>
-
-QT_BEGIN_NAMESPACE
-class QVariant;
-QT_END_NAMESPACE
-
-namespace QJson {
-  /**
-  * @brief Convenience class for converting JSON data to QVariant objects using a dedicated thread
-  */
-  class QJSON_EXPORT ParserRunnable  : public QObject, public QRunnable
-  {
-    Q_OBJECT
-    public:
-      explicit ParserRunnable(QObject* parent = 0);
-      ~ParserRunnable();
-
-      void setData( const QByteArray& data );
-
-      void run();
-
-    Q_SIGNALS:
-      /**
-      * This signal is emitted when the parsing process has been completed
-      * @param json contains the result of the parsing
-      * @param ok if a parsing error occurs ok is set to false, otherwise it's set to true.
-      * @param error_msg contains a string explaining the failure reason
-      **/
-      void parsingFinished(const QVariant& json, bool ok, const QString& error_msg);
-
-    private:
-      Q_DISABLE_COPY(ParserRunnable)
-      class Private;
-      Private* const d;
-  };
-}
-
-#endif // PARSERRUNNABLE_H

BIN
qjson/qjson.dll


BIN
qjson/qjson.lib


+ 0 - 35
qjson/qjson_export.h

@@ -1,35 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2009 Pino Toscano <pino@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License version 2.1, as published by the Free Software Foundation.
-    
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef QJSON_EXPORT_H
-#define QJSON_EXPORT_H
-
-#include <QtCore/qglobal.h>
-
-#ifndef QJSON_EXPORT
-# if defined(QJSON_MAKEDLL)
-   /* We are building this library */
-#  define QJSON_EXPORT Q_DECL_EXPORT
-# else
-   /* We are using this library */
-#  define QJSON_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#endif

+ 0 - 147
qjson/qobjecthelper.h

@@ -1,147 +0,0 @@
-/* This file is part of qjson
-  *
-  * Copyright (C) 2009 Flavio Castelli <flavio@castelli.name>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-  * License version 2.1, as published by the Free Software Foundation.
-  * 
-  *
-  * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public License
-  * along with this library; see the file COPYING.LIB.  If not, write to
-  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
-
-#ifndef QOBJECTHELPER_H
-#define QOBJECTHELPER_H
-
-#include "qjson_export.h"
-
-#include <QtCore/QLatin1String>
-#include <QtCore/QStringList>
-#include <QtCore/QVariantMap>
-
-QT_BEGIN_NAMESPACE
-class QObject;
-QT_END_NAMESPACE
-
-namespace QJson {
-  /**
-  * @brief Class used to convert QObject into QVariant and vivce-versa.
-  * During these operations only the class attributes defined as properties will
-  * be considered.
-  * Properties marked as 'non-stored' will be ignored.
-  *
-  * Suppose the declaration of the Person class looks like this:
-  * \code
-  * class Person : public QObject
-    {
-      Q_OBJECT
-
-      Q_PROPERTY(QString name READ name WRITE setName)
-      Q_PROPERTY(int phoneNumber READ phoneNumber WRITE setPhoneNumber)
-      Q_PROPERTY(Gender gender READ gender WRITE setGender)
-      Q_PROPERTY(QDate dob READ dob WRITE setDob)
-      Q_ENUMS(Gender)
-
-     public:
-        Person(QObject* parent = 0);
-        ~Person();
-
-        QString name() const;
-        void setName(const QString& name);
-
-        int phoneNumber() const;
-        void setPhoneNumber(const int  phoneNumber);
-
-        enum Gender {Male, Female};
-        void setGender(Gender gender);
-        Gender gender() const;
-
-        QDate dob() const;
-        void setDob(const QDate& dob);
-
-      private:
-        QString m_name;
-        int m_phoneNumber;
-        Gender m_gender;
-        QDate m_dob;
-    };
-    \endcode
-
-    The following code will serialize an instance of Person to JSON :
-
-    \code
-    Person person;
-    person.setName("Flavio");
-    person.setPhoneNumber(123456);
-    person.setGender(Person::Male);
-    person.setDob(QDate(1982, 7, 12));
-
-    QVariantMap variant = QObjectHelper::qobject2qvariant(&person);
-    Serializer serializer;
-    qDebug() << serializer.serialize( variant);
-    \endcode
-
-    The generated output will be:
-    \code
-    { "dob" : "1982-07-12", "gender" : 0, "name" : "Flavio", "phoneNumber" : 123456 }
-    \endcode
-
-    It's also possible to initialize a QObject using the values stored inside of
-    a QVariantMap.
-
-    Suppose you have the following JSON data stored into a QString:
-    \code
-    { "dob" : "1982-07-12", "gender" : 0, "name" : "Flavio", "phoneNumber" : 123456 }
-    \endcode
-
-    The following code will initialize an already allocated instance of Person
-    using the JSON values:
-    \code
-    Parser parser;
-    QVariant variant = parser.parse(json);
-
-    Person person;
-    QObjectHelper::qvariant2qobject(variant.toMap(), &person);
-    \endcode
-
-    \sa Parser
-    \sa Serializer
-  */
-  class QJSON_EXPORT QObjectHelper {
-    public:
-      QObjectHelper();
-      ~QObjectHelper();
-
-    /**
-    * This method converts a QObject instance into a QVariantMap.
-    *
-    * @param object The QObject instance to be converted.
-    * @param ignoredProperties Properties that won't be converted.
-    */
-    static QVariantMap qobject2qvariant( const QObject* object,
-                                  const QStringList& ignoredProperties = QStringList(QString(QLatin1String("objectName"))));
-
-    /**
-    * This method converts a QVariantMap instance into a QObject
-    *
-    * @param variant Attributes to assign to the object.
-    * @param object The QObject instance to update.
-    */
-    static void qvariant2qobject(const QVariantMap& variant, QObject* object);
-
-    private:
-      Q_DISABLE_COPY(QObjectHelper)
-      class QObjectHelperPrivate;
-      QObjectHelperPrivate* const d;
-  };
-}
-
-#endif // QOBJECTHELPER_H

+ 0 - 230
qjson/serializer.h

@@ -1,230 +0,0 @@
-/* This file is part of qjson
-  *
-  * Copyright (C) 2009 Till Adam <adam@kde.org>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-  * License version 2.1, as published by the Free Software Foundation.
-  * 
-  *
-  * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public License
-  * along with this library; see the file COPYING.LIB.  If not, write to
-  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
-
-#ifndef QJSON_SERIALIZER_H
-#define QJSON_SERIALIZER_H
-
-#include "qjson_export.h"
-
-QT_BEGIN_NAMESPACE
-class QIODevice;
-class QString;
-class QVariant;
-QT_END_NAMESPACE
-
-namespace QJson {
-  /**
-   @brief How the indentation should work.
-   \verbatim
-   none (default) :
-            { "foo" : 0, "foo1" : 1, "foo2" : [ { "bar" : 1, "foo" : 0, "foobar" : 0 }, { "bar" : 1, "foo" : 1, "foobar" : 1 } ], "foo3" : [ 1, 2, 3, 4, 5, 6 ] }
-  
-   compact :
-            {"foo":0,"foo1":1,"foo2":[{"bar":1,"foo":0,"foobar":0},{"bar":1,"foo":1,"foobar":1}],"foo3":[1,2,3,4,5,6]}
-  
-   minimum :
-            { "foo" : 0, "foo1" : 1, "foo2" : [
-              { "bar" : 1, "foo" : 0, "foobar" : 0 },
-              { "bar" : 1, "foo" : 1, "foobar" : 1 }
-             ], "foo3" : [
-              1,
-              2,
-              3,
-              4,
-              5,
-              6
-             ] }
-
-   medium :
-            {
-             "foo" : 0, "foo1" : 1, "foo2" : [
-              {
-               "bar" : 1, "foo" : 0, "foobar" : 0
-              },
-              {
-               "bar" : 1, "foo" : 1, "foobar" : 1
-              }
-             ], "foo3" : [
-              1,
-              2,
-              3,
-              4,
-              5,
-              6
-             ]
-            }
-
-   full :
-            {
-             "foo" : 0,
-             "foo1" : 1,
-             "foo2" : [
-              {
-               "bar" : 1,
-               "foo" : 0,
-               "foobar" : 0
-              },
-              {
-               "bar" : 1,
-               "foo" : 1,
-               "foobar" : 1
-              }
-             ],
-             "foo3" : [
-              1,
-              2,
-              3,
-              4,
-              5,
-              6
-             ]
-            }
-
-  
-   \endverbatim
-  */
-  enum IndentMode {
-    IndentNone,
-    IndentCompact,
-    IndentMinimum,
-    IndentMedium,
-    IndentFull
-  };
-  /**
-  * @brief Main class used to convert QVariant objects to JSON data.
-  *
-  * QVariant objects are converted to a string containing the JSON data.
-  *
-  *
-  * Usage:
-  *
-  * \code
-  * QVariantList people;
-  *
-  * QVariantMap bob;
-  * bob.insert("Name", "Bob");
-  * bob.insert("Phonenumber", 123);
-  *
-  * QVariantMap alice;
-  * alice.insert("Name", "Alice");
-  * alice.insert("Phonenumber", 321);
-  *
-  * people << bob << alice;
-  *
-  * QJson::Serializer serializer;
-  * bool ok;
-  * QByteArray json = serializer.serialize(people, &ok);
-  *
-  * if (ok) {
-  *   qDebug() << json;
-  * } else {
-  *   qCritical() << "Something went wrong:" << serializer.errorMessage();
-  * }
-  * \endcode
-  *
-  * The output will be:
-  *
-  * \code
-  *  "[ { "Name" : "Bob", "Phonenumber" : 123 },
-  *     { "Name" : "Alice", "Phonenumber" : 321 } ]"
-  * \endcode
-  *
-  * It's possible to tune the indentation level of the resulting string. \sa setIndentMode
-  */
-  class QJSON_EXPORT Serializer {
-  public:
-    Serializer();
-    ~Serializer();
-
-     /**
-      * This method generates a textual JSON representation and outputs it to the
-      * passed in I/O Device.
-      * @param variant The JSON document in its in-memory representation as generated by the
-      * parser.
-      * @param out Input output device
-      * @param ok if a conversion error occurs, *ok is set to false; otherwise *ok is set to true
-      */
-    void serialize( const QVariant& variant, QIODevice* out, bool* ok);
-
-    /**
-      * This is a method provided for convenience. It turns the passed in in-memory
-      * representation of the JSON document into a textual one, which is returned.
-      * If the returned string is empty, the document was empty. If it was null, there
-      * was a parsing error.
-      *
-      * @param variant The JSON document in its in-memory representation as generated by the
-      * parser.
-      *
-      * \deprecated This method is going to be removed with the next major release of QJson.
-      */
-    QByteArray serialize( const QVariant& variant);
-
-    /**
-      * This is a method provided for convenience. It turns the passed in in-memory
-      * representation of the JSON document into a textual one, which is returned.
-      * If the returned string is empty, the document was empty. If it was null, there
-      * was a parsing error.
-      *
-      * @param variant The JSON document in its in-memory representation as generated by the
-      * parser.
-      * @param ok if a conversion error occurs, *ok is set to false; otherwise *ok is set to true
-      */
-    QByteArray serialize( const QVariant& variant, bool *ok);
-
-    /**
-     * Allow or disallow writing of NaN and/or Infinity (as an extension to QJson)
-     */
-    void allowSpecialNumbers(bool allow);
-
-    /**
-     * Is Nan and/or Infinity allowed?
-     */
-    bool specialNumbersAllowed() const;
-
-    /**
-     * set output indentation mode as defined in QJson::IndentMode
-     */
-    void setIndentMode(IndentMode mode = QJson::IndentNone);
-
-
-    /**
-    * set double precision used while converting Double
-    * \sa QByteArray::number
-    */
-    void setDoublePrecision(int precision);
-
-    /**
-     * Returns one of the indentation modes defined in QJson::IndentMode
-     */
-    IndentMode indentMode() const;
-
-    /**
-     * Returns the error message
-     */
-    QString errorMessage() const;
-
-  private:
-    Q_DISABLE_COPY(Serializer)
-    class SerializerPrivate;
-    SerializerPrivate* const d;
-  };
-}
-
-#endif // QJSON_SERIALIZER_H

+ 0 - 71
qjson/serializerrunnable.h

@@ -1,71 +0,0 @@
-/* This file is part of qjson
- *
- * Copyright (C) 2009 Frank Osterfeld <osterfeld@kde.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- * 
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef SERIALIZERRUNNABLE_H
-#define SERIALIZERRUNNABLE_H
-
-#include "qjson_export.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QRunnable>
-
-QT_BEGIN_NAMESPACE
-class QByteArray;
-class QString;
-class QVariant;
-QT_END_NAMESPACE
-
-namespace QJson {
-  /**
-  * @brief Convenience class for converting JSON data to QVariant objects using a dedicated thread
-  */
-  class QJSON_EXPORT SerializerRunnable  : public QObject, public QRunnable
-  {
-    Q_OBJECT
-    public:
-      explicit SerializerRunnable(QObject* parent = 0);
-      ~SerializerRunnable();
-
-      /**
-       * Sets the json object to serialize.
-       *
-       * @param json QVariant containing the json representation to be serialized
-       */
-      void setJsonObject( const QVariant& json );
-
-      /* reimp */ void run();
-
-    Q_SIGNALS:
-      /**
-      * This signal is emitted when the serialization process has been completed
-      * @param serialized contains the result of the serialization
-      * @param ok if a serialization error occurs ok is set to false, otherwise it's set to true.
-      * @param error_msg contains a string explaining the failure reason
-      **/
-      void parsingFinished(const QByteArray& serialized, bool ok, const QString& error_msg);
-
-    private:
-      Q_DISABLE_COPY(SerializerRunnable)
-      class Private;
-      Private* const d;
-  };
-}
-
-#endif // SERIALIZERRUNNABLE_H

+ 4 - 4
version.h

@@ -1,11 +1,11 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VER_FILEVERSION             1,3,0,2
-#define VER_FILEVERSION_STR         "1.3.0.2\0"
+#define VER_FILEVERSION             1,4,0,4
+#define VER_FILEVERSION_STR         "1.4.0.4\0"
 
-#define VER_PRODUCTVERSION          1,3,0,2
-#define VER_PRODUCTVERSION_STR      "1.3\0"
+#define VER_PRODUCTVERSION          1,4,0,4
+#define VER_PRODUCTVERSION_STR      "1.4\0"
 
 #define VER_COMPANYNAME_STR         "GwillzCorp"
 #define VER_FILEDESCRIPTION_STR     "PhotoBunny"