aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypeloader.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-08-09 15:46:38 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2016-08-10 12:44:12 +0000
commit9425f832cdc036818cb08d1bd1328345fcb6f2ff (patch)
tree67f81cfa1b1637b856f5d7072690e252e1ac41a8 /src/qml/qml/qqmltypeloader.cpp
parent3d618b58b4f138717dffc81c9c421fe4398dd30c (diff)
Enable disk caching on Windows
In order to enable the disk cache we need to replace the QFile::map usage with direct win32 file API calls in order to create executable file mappings. The files opened with QFile lack GENERIC_EXECUTE in the open flags. The code remains disabled on WinRT for now. Change-Id: I7d12267755a9de0344ac087b2ff67140531d9df0 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
-rw-r--r--src/qml/qml/qqmltypeloader.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index a151f50a00..4fa69d22bb 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -104,22 +104,12 @@
#endif
DEFINE_BOOL_CONFIG_OPTION(dumpErrors, QML_DUMP_ERRORS);
-DEFINE_BOOL_CONFIG_OPTION(_disableDiskCache, QML_DISABLE_DISK_CACHE);
+DEFINE_BOOL_CONFIG_OPTION(disableDiskCache, QML_DISABLE_DISK_CACHE);
DEFINE_BOOL_CONFIG_OPTION(forceDiskCache, QML_FORCE_DISK_CACHE);
Q_DECLARE_LOGGING_CATEGORY(DBG_DISK_CACHE)
Q_LOGGING_CATEGORY(DBG_DISK_CACHE, "qt.qml.diskcache")
-static bool disableDiskCache()
-{
- return _disableDiskCache()
- // ### FIXME: Fix crashes on Windows with mmap'ed code.
-#if defined(Q_OS_WIN)
- || true
-#endif
- ;
-}
-
QT_BEGIN_NAMESPACE
namespace {