- updated qt-solutions

- zlib winapi in static build

Author: cristian-anita

ChangeLog

@@ -9,6 +9,7 @@ Version 1.0.9.1:
 	- updated KSqueezedTextLabel to KF5
 	- improved DiskSpaceWidget layout
 	- added icon pixmap to MessageBox
+	- updated qt-solutions
 - Fixed bugs:
 	- fixed CoreApplicationBase::GetSupportedLanguageInfos()
 	- fixed meta type issues in qt solutions integration

include/cppdevtk/config/third_party.hpp

@@ -117,11 +117,10 @@
 
 
 #if (CPPDEVTK_PLATFORM_WINDOWS)
+#	ifndef ZLIB_WINAPI
+#		define ZLIB_WINAPI
+#	endif
 #	ifdef CPPDEVTK_SHARED
-#		ifndef ZLIB_WINAPI
-#			define ZLIB_WINAPI
-#		endif
-
 #		ifndef ZLIB_DLL
 #			define ZLIB_DLL
 #		endif

src/util/qt_local_peer.cpp

@@ -184,8 +184,17 @@ void QtLocalPeer::receiveConnection()
     if (!socket)
         return;
 
-    while (socket->bytesAvailable() < (int)sizeof(quint32))
+    while (true) {
+        if (socket->state() == QLocalSocket::UnconnectedState) {
+            qWarning("QtLocalPeer: Peer disconnected");
+            delete socket;
+            return;
+        }
+        if (socket->bytesAvailable() >= qint64(sizeof(quint32)))
+            break;
         socket->waitForReadyRead();
+    }
+
     QDataStream ds(socket);
     QByteArray uMsg;
     quint32 remaining;

src/util/qt_service.cpp

@@ -862,11 +862,13 @@ int QtServiceBase::exec()
             d_ptr->controller.sendCommand(code);
             return 0;
         } else  if (a == QLatin1String("-h") || a == QLatin1String("-help")) {
-            printf("\n%s -[i|u|e|s|v|h]\n"
+            printf("\n%s -[i|u|e|t|p|r|c|v|h]\n"
                    "\t-i(nstall) [account] [password]\t: Install the service, optionally using given account and password\n"
                    "\t-u(ninstall)\t: Uninstall the service.\n"
                    "\t-e(xec)\t\t: Run as a regular application. Useful for debugging.\n"
                    "\t-t(erminate)\t: Stop the service.\n"
+                   "\t-p(ause)\t: Pause the service.\n"
+                   "\t-r(esume)\t: Resume a paused service.\n"
                    "\t-c(ommand) num\t: Send command code num to the service.\n"
                    "\t-v(ersion)\t: Print version and status information.\n"
                    "\t-h(elp)   \t: Show this help\n"