Merge pull request #11 from todbot/master

Small fixes for QT5
pypt · Aug 17, 2013 · b965e26 · b965e26
2 parents 9682465 + 96f2df9
commit b965e26
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/Fervor.pri b/Fervor.pri
@@ -1,4 +1,4 @@
-QT += core gui webkit network
+QT += core gui webkit webkitwidgets network
 
 isEmpty(FV_APP_NAME) {
 	warning("Fervor: falling back to application name '$$TARGET'")
@@ -27,24 +27,26 @@ isEmpty(FV_APP_VERSION) {
 DEPENDPATH += "$$PWD"
 INCLUDEPATH += "$$PWD"
 
-SOURCES += fvupdatewindow.cpp \
-	fvupdater.cpp \
-	fvversioncomparator.cpp \
-	fvplatform.cpp \
-	fvignoredversions.cpp \
-	fvavailableupdate.cpp \
-	fvupdateconfirmdialog.cpp
-
-HEADERS += fvupdatewindow.h \
-	fvupdater.h \
-	fvversioncomparator.h \
-	fvplatform.h \
-	fvignoredversions.h \
-	fvavailableupdate.h \
-	fvupdateconfirmdialog.h
-
-FORMS += fvupdatewindow.ui \
-	fvupdateconfirmdialog.ui
-
-TRANSLATIONS += fervor_lt.ts
+SOURCES += \
+        $$PWD/fvupdatewindow.cpp \
+        $$PWD/fvupdater.cpp \
+        $$PWD/fvversioncomparator.cpp \
+        $$PWD/fvplatform.cpp \
+        $$PWD/fvignoredversions.cpp \
+        $$PWD/fvavailableupdate.cpp \
+        $$PWD/fvupdateconfirmdialog.cpp
+
+HEADERS += \
+        $$PWD/fvupdatewindow.h \
+        $$PWD/fvupdater.h \
+        $$PWD/fvversioncomparator.h \
+        $$PWD/fvplatform.h \
+        $$PWD/fvignoredversions.h \
+        $$PWD/fvavailableupdate.h \
+        $$PWD/fvupdateconfirmdialog.h
+
+FORMS += $$PWD/fvupdatewindow.ui \
+        $$PWD/fvupdateconfirmdialog.ui
+
+TRANSLATIONS += $$PWD/fervor_lt.ts
 CODECFORTR = UTF-8
diff --git a/fvupdater.cpp b/fvupdater.cpp
@@ -87,7 +87,7 @@ void FvUpdater::installTranslator()
 	QTranslator translator;
 	QString locale = QLocale::system().name();
 	translator.load(QString("fervor_") + locale);
-	QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
+    //QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
 	qApp->installTranslator(&translator);
 }
 

diff --git a/fvversioncomparator.cpp b/fvversioncomparator.cpp
@@ -2,6 +2,7 @@
 #include <string>
 #include <algorithm>
 #include <cctype>
+#include <stdlib.h>  // for atoi()
 
 //
 // Clone of Sparkle's SUStandardVersionComparator.m, so here's original author's