Bump to 3.1.8

This reverts commit b294d89b4f.

Changelog

@@ -1,3 +1,9 @@
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.8
+    - BUGFIX: Really fix build of v3.1.6
+
+* Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7
+    - BUGFIX: Fix build of v3.1.6
+
 * Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6
     - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999)
     - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso)

src/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.6</string>
+	<string>3.1.8</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>

src/properties/trackerlist.cpp

@@ -426,6 +426,7 @@ void TrackerList::showTrackerListMenu(QPoint) {
     copyAct = menu.addAction(IconProvider::instance()->getIcon("edit-copy"), tr("Copy tracker url"));
     editAct = menu.addAction(IconProvider::instance()->getIcon("edit-rename"),tr("Edit selected tracker URL"));
   }
+  QAction *reannounceAct = NULL;
   if (!h.is_paused()) {
     menu.addSeparator();
     reannounceAct = menu.addAction(IconProvider::instance()->getIcon("view-refresh"), tr("Force reannounce to all trackers"));

src/windows/options.nsi

@@ -18,7 +18,7 @@ XPStyle on
 !define CSIDL_APPDATA '0x1A' ;Application Data path
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
-!define PROG_VERSION "3.1.6"
+!define PROG_VERSION "3.1.8"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\qbittorrent.exe"
 !define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt)
 

version.pri

@@ -1,5 +1,5 @@
 PROJECT_NAME = qbittorrent
-PROJECT_VERSION = 3.1.6
+PROJECT_VERSION = 3.1.8
 
 os2 {
     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
@@ -9,4 +9,4 @@ os2 {
 
 DEFINES += VERSION_MAJOR=3
 DEFINES += VERSION_MINOR=1
-DEFINES += VERSION_BUGFIX=6
+DEFINES += VERSION_BUGFIX=8