merge windows changes

src/bincimapmime/mime-parseonlyheader.cc

@@ -115,7 +115,7 @@ int Binc::MimePart::doParseOnlyHeader(MimeInputSource *ms,
       if (c == '\n') ++nlines;
       if (c == ':') break;
       if (c == '\n') {
-	for (string::size_type i = name.length() - 1; i >= 0; --i)
+    for (int i = int(name.length()) - 1; i >= 0; --i)
 	  mimeSource->ungetChar();
 
 	quit = true;

src/common/textsplit.cpp

@@ -364,11 +364,12 @@ bool TextSplit::words_from_span(size_t bp)
  * @param spanerase Set if the current span is at its end. Process it.
  * @param bp        The current BYTE position in the stream
  */
-inline bool TextSplit::doemit(bool spanerase, size_t bp)
+inline bool TextSplit::doemit(bool spanerase, size_t _bp)
 {
+    int bp = int(_bp);
     LOGDEB2(("TextSplit::doemit: sper %d bp %d spp %d spanwords %u wS %d wL %d "
             "inn %d span [%s]\n",
-             spanerase, int(bp), m_spanpos, m_words_in_span.size(), 
+             spanerase, bp, m_spanpos, m_words_in_span.size(), 
             m_wordStart, m_wordLen, m_inNumber, m_span.c_str()));
 
     if (m_wordLen) {

src/qtgui/recoll-win.pro

@@ -27,6 +27,7 @@ HEADERS += \
         fragbuts.h \
         idxsched.h \
         widgets/listdialog.h \
+        widgets/qxtconfirmationmessage.h \
         preview_w.h \
         preview_load.h \
         preview_plaintorich.h \

src/qtgui/widgets/qxtglobal.h

@@ -49,6 +49,8 @@
 
 //--------------------------export macros------------------------------
 
+#define QXT_STATIC
+
 #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE
 
 #if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN)

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.22.0-20151202"
+#define MyAppVersion "1.22.0-20160129"
 #define MyAppPublisher "Recoll.org"
 #define MyAppURL "http://www.recoll.org"
 #define MyAppExeName "recoll.exe"