Several changes:

 - Made it possible to choose between standalone Asio and Boost.Asio at compile time
 - Made it possible to use compiled Wt without Boost headers when using standalone Asio
 - fix illegal use of modelindexes after removal (reported on Wt forum)
 - issue #5428: changed headers() implementation from map to vector
 - Fix issue 5463: Documentation missing on WModelIndexSet
 - issue #5314: WStackedWidget in a layout can receive incorrect height after animation
 - issue #5329: documented limitations to setTransitionAnimation
 - More debug logging for ackId checking
 - Wt.min.js: fixed if statement being optimized away by minifier

Author: RockinRoel

CMakeLists.txt

@@ -278,6 +278,8 @@ SET(GM_PREFIX ${USERLIB_PREFIX} CACHE PATH
 SET(SKIA_PREFIX ${USERLIB_PREFIX} CACHE PATH
   "Prefix of skia library (overrides USERLIB_PREFIX)")
 SET(WT_TZDATA_INSTALL "." CACHE PATH "The location where the time zone data is installed (defaults to current working directory)")
+SET(ASIO_PREFIX ${USERLIB_PREFIX} CACHE PATH
+  "Prefix of Asio (overrides USERLIB_PREFIX), only used when WT_ASIO_IMPLEMENTATION is standalone")
 
 OPTION(DEBUG "Support for debugging, must be enabled also in wt_config.xml" OFF)
 
@@ -433,6 +435,31 @@ ELSE (${WT_CPP17_ANY_IMPLEMENTATION} STREQUAL "thelink2012")
   MESSAGE(FATAL_ERROR "WT_CPP17_ANY_IMPLEMENTATION must be one of thelink2012, experimental, or std")
 ENDIF (${WT_CPP17_ANY_IMPLEMENTATION} STREQUAL "thelink2012")
 
+SET(WT_ASIO_DEFAULT_IMPLEMENTATION "boost")
+SET(WT_ASIO_IMPLEMENTATION ${WT_ASIO_DEFAULT_IMPLEMENTATION} CACHE STRING
+"Implementation of Asio to use. Defaults to \"boost\". Use \"standalone\" and provide its path in ASIO_PREFIX to use the standalone version.")
+
+IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+  MESSAGE(STATUS "Informational: WT_ASIO_IMPLEMENTATION should be boost, or standalone")
+ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+  SET_PROPERTY(CACHE WT_ASIO_IMPLEMENTATION PROPERTY STRINGS boost standalone)
+ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+
+IF (${WT_ASIO_IMPLEMENTATION} STREQUAL "boost")
+  SET(WT_ASIO_IS_BOOST_ASIO ON)
+ELSEIF(${WT_ASIO_IMPLEMENTATION} STREQUAL "standalone")
+  SET(WT_ASIO_IS_STANDALONE_ASIO ON)
+ELSE(${WT_ASIO_IMPLEMENTATION} STREQUAL "boost")
+  MESSAGE(FATAL_ERROR "WT_ASIO_IMPLEMENTATION must be boost or standalone")
+ENDIF(${WT_ASIO_IMPLEMENTATION} STREQUAL "boost")
+
+IF(WT_ASIO_IS_STANDALONE_ASIO)
+IF(NOT EXISTS "${ASIO_PREFIX}/include/asio.hpp")
+MESSAGE(FATAL_ERROR "WT_ASIO_IMPLEMENTATION is set to standalone, but Asio was not found in ASIO_PREFIX")
+ENDIF(NOT EXISTS "${ASIO_PREFIX}/include/asio.hpp")
+INCLUDE_DIRECTORIES("${ASIO_PREFIX}/include")
+ENDIF(WT_ASIO_IS_STANDALONE_ASIO)
+
 FIND_PACKAGE(Doxygen)
 
 # Boost is used nearly everywhere, so we can put these here

WConfig.h.in

@@ -39,6 +39,9 @@
 #cmakedefine WT_ANY_IS_EXPERIMENTAL_ANY
 #cmakedefine WT_ANY_IS_STD_ANY
 
+#cmakedefine WT_ASIO_IS_BOOST_ASIO
+#cmakedefine WT_ASIO_IS_STANDALONE_ASIO
+
 // our win32: WIN32 (gcc) or _WIN32 (MSC)
 #if defined(WIN32) || defined(_WIN32)
 #define WT_WIN32 1

examples/feature/socketnotifier/README.md

@@ -5,7 +5,7 @@ This is an example that illustrates the use of the `WSocketNotifier` API
 to monitor one or more sockets within a Wt application.
 
 If you need only to monitor networking sockets, then you can also use
-boost::asio, using the boost::asio service available from
+asio, using the asio service available from
 `WServer::ioService()`.
 
 How to run

examples/qrlogin/model/QRAuthService.C

@@ -122,7 +122,7 @@ void QRAuthService::remoteLogin(QRTokenDatabase& database,
   }
 }
 
-void QRAuthService::handleHttpResponse(boost::system::error_code err,
+void QRAuthService::handleHttpResponse(Wt::Asio::error_code err,
 				       const Http::Message& response,
 				       Http::Client *client) const
 {

examples/qrlogin/model/QRAuthService.h

@@ -8,10 +8,13 @@
 #define QR_AUTH_SERVICE_H_
 
 #include <string>
-#include <system_error>
 #include <Wt/WGlobal.h>
 #include <Wt/Http/Client.h>
 
+// #include <system_error> for standalone Asio
+// #include <boost/system/system_error.hpp> for Boost.Asio
+#include <Wt/Asio/system_error.hpp>
+
 using namespace Wt;
 
 class QRTokenDatabase;
@@ -42,7 +45,7 @@ class QRAuthService
   const Auth::AuthService& baseAuth_;
   std::string redirectParameter_;
 
-  void handleHttpResponse(boost::system::error_code err,
+  void handleHttpResponse(Wt::Asio::error_code err,
                           const Http::Message& response,
                           Http::Client *client) const;
 };

resources/webkit-transitions.css

@@ -108,7 +108,7 @@
 
 
 @-webkit-keyframes slideinfromtop {
-    from { -webkit-transform: translate3d(0,-100%,); }
+    from { -webkit-transform: translate3d(0,-100%,0); }
     to { -webkit-transform: translate3d(0,0,0); }
 }
 

src/Wt/Asio/asio.hpp

@@ -0,0 +1,24 @@
+// This may look like C code, but it's really -*- C++ -*-
+/*
+ * Copyright (C) 2016 Emweb bvba, Herent, Belgium.
+ *
+ * See the LICENSE file for terms of use.
+ */
+#ifndef WT_ASIO_ASIO_H_
+#define WT_ASIO_ASIO_H_
+
+#include "Wt/WConfig.h"
+
+#ifdef WT_ASIO_IS_BOOST_ASIO
+
+#include <boost/asio.hpp>
+
+#else // WT_ASIO_IS_STANDALONE_ASIO
+
+#include <asio.hpp>
+
+#endif // WT_ASIO_IS_BOOST_ASIO
+
+#include "namespace.hpp"
+
+#endif // WT_ASIO_ASIO_H_

src/Wt/Asio/io_service.hpp

@@ -0,0 +1,24 @@
+// This may look like C code, but it's really -*- C++ -*-
+/*
+ * Copyright (C) 2016 Emweb bvba, Herent, Belgium.
+ *
+ * See the LICENSE file for terms of use.
+ */
+#ifndef WT_ASIO_IO_SERVICE_H_
+#define WT_ASIO_IO_SERVICE_H_
+
+#include "Wt/WConfig.h"
+
+#ifdef WT_ASIO_IS_BOOST_ASIO
+
+#include <boost/asio/io_service.hpp>
+
+#else // WT_ASIO_IS_STANDALONE_ASIO
+
+#include <asio/io_service.hpp>
+
+#endif // WT_ASIO_IS_BOOST_ASIO
+
+#include "namespace.hpp"
+
+#endif // WT_ASIO_IO_SERVICE_H_

src/Wt/Asio/namespace.hpp

@@ -0,0 +1,28 @@
+// This may look like C code, but it's really -*- C++ -*-
+/*
+ * Copyright (C) 2016 Emweb bvba, Herent, Belgium.
+ *
+ * See the LICENSE file for terms of use.
+ */
+#ifndef WT_ASIO_NAMESPACE_H_
+#define WT_ASIO_NAMESPACE_H_
+
+#if defined(WT_ASIO_IS_BOOST_ASIO)
+
+namespace Wt {
+  namespace Asio {
+    namespace asio = ::boost::asio;
+  }
+}
+
+#elif defined(WT_ASIO_IS_STANDALONE_ASIO)
+
+namespace Wt {
+  namespace Asio {
+    namespace asio = ::asio;
+  }
+}
+
+#endif // WT_ASIO_IS_BOOST_ASIO
+
+#endif // WT_ASIO_NAMESPACE_H_

src/Wt/Asio/ssl.hpp

@@ -0,0 +1,24 @@
+// This may look like C code, but it's really -*- C++ -*-
+/*
+ * Copyright (C) 2016 Emweb bvba, Herent, Belgium.
+ *
+ * See the LICENSE file for terms of use.
+ */
+#ifndef WT_ASIO_SSL_H_
+#define WT_ASIO_SSL_H_
+
+#include "Wt/WConfig.h"
+
+#ifdef WT_ASIO_IS_BOOST_ASIO
+
+#include <boost/asio/ssl.hpp>
+
+#else // WT_ASIO_IS_STANDALONE_ASIO
+
+#include <asio/ssl.hpp>
+
+#endif // WT_ASIO_IS_BOOST_ASIO
+
+#include "namespace.hpp"
+
+#endif // WT_ASIO_SSL_H_