Small Windows fixes for 1.24

src/common/autoconfig-win.h

@@ -112,7 +112,7 @@ overriden in the c++ code by ifdefs _WIN32 anyway  */
 #define PACKAGE_NAME "Recoll"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Recoll 1.23.3"
+#define PACKAGE_STRING "Recoll 1.24.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "recoll"
@@ -121,7 +121,7 @@ overriden in the c++ code by ifdefs _WIN32 anyway  */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.23.3"
+#define PACKAGE_VERSION "1.24.1"
 
 /* putenv parameter is const */
 /* #undef PUTENV_ARG_CONST */

src/qtgui/rclm_idx.cpp

@@ -306,6 +306,11 @@ void RclMain::bumpIndexing()
         system(cmd.c_str());
     }
 }
+#else
+// Because moc does not understand ifdefs, have to have this as an empty func
+void RclMain::bumpIndexing()
+{
+}
 #endif
 
 static void delay(int millisecondsWait)

src/qtgui/rclmain_w.h

@@ -96,9 +96,7 @@ public slots:
     virtual void fileExit();
     virtual void periodic100();
     virtual void toggleIndexing();
-#ifndef _WIN32
     virtual void bumpIndexing();
-#endif
     virtual void rebuildIndex();
     virtual void specialIndex();
     virtual void startSearch(std::shared_ptr<Rcl::SearchData> sdata,

src/qtgui/uiprefs.ui

@@ -802,7 +802,7 @@ May be slow for big documents.</string>
             </layout>
            </item>
            <item>
-            <widget class="Line" name="line3">
+            <widget class="Line" name="line31">
              <property name="frameShape">
               <enum>QFrame::HLine</enum>
              </property>

src/windows/qmkrecoll/librecoll.pro

@@ -37,6 +37,7 @@ SOURCES += \
 ../../index/exefetcher.cpp \
 ../../index/fsfetcher.cpp \
 ../../index/fsindexer.cpp \
+../../index/idxstatus.cpp \
 ../../index/indexer.cpp \
 ../../index/mimetype.cpp \
 ../../index/subtreelist.cpp \
@@ -67,6 +68,7 @@ SOURCES += \
 ../../rcldb/daterange.cpp \
 ../../rcldb/expansiondbs.cpp \
 ../../rcldb/rclabstract.cpp \
+../../rcldb/rclabsfromtext.cpp \
 ../../rcldb/rcldb.cpp \
 ../../rcldb/rcldoc.cpp \
 ../../rcldb/rcldups.cpp \
@@ -78,6 +80,8 @@ SOURCES += \
 ../../rcldb/stemdb.cpp \
 ../../rcldb/stoplist.cpp \
 ../../rcldb/synfamily.cpp \
+../../rcldb/rclvalues.cpp \
+../../rcldb/rclvalues.h \
 ../../unac/unac.cpp \
 ../../utils/appformime.cpp \
 ../../utils/base64.cpp \
@@ -88,6 +92,8 @@ SOURCES += \
 ../../utils/copyfile.cpp \
 ../../utils/cpuconf.cpp \
 ../../utils/ecrontab.cpp \
+../../utils/zlibut.cpp \
+../../utils/zlibut.h \
 ../../windows/execmd_w.cpp \
 ../../windows/fnmatch.c \
 ../../windows/wincodepages.cpp \

src/windows/recoll-setup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Recoll"
-#define MyAppVersion "1.23.3-20170904-799190"
+#define MyAppVersion "1.24.1-20180120-fd3287"
 #define MyAppPublisher "Recoll.org"
 #define MyAppURL "http://www.recoll.org"
 #define MyAppExeName "recoll.exe"