diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 16:29:33 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | 0f9f596816bdeb6b1128a2a713730f6c2c21ede1 (patch) | |
tree | 3582aed3809d08341dad9594026cdcf877a9856a /Source/WebKit2/UIProcess | |
parent | d441d6f39bb846989d95bcf5caf387b42414718d (diff) | |
download | qtwebkit-0f9f596816bdeb6b1128a2a713730f6c2c21ede1.tar.gz |
Fix build with gcc 4.4
Nullptr is one of the C++11 features not fully supported in gcc 4.4,
we can therefore not rely on it being converted to a pointer automatically.
Change-Id: I91830a2e78d9eb7532930581774cc095181cbf83
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess')
-rw-r--r-- | Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp index 2279aaecd..6af593a54 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp @@ -123,7 +123,7 @@ PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(uint64_t plug } } - return nullptr; + return 0; } } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp index f58fe8a79..1612444e1 100644 --- a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp +++ b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp @@ -53,7 +53,7 @@ LocalStorageDatabaseTracker::~LocalStorageDatabaseTracker() void LocalStorageDatabaseTracker::setLocalStorageDirectory(const String& localStorageDirectory) { // FIXME: We should come up with a better idiom for safely copying strings across threads. - RefPtr<StringImpl> copiedLocalStorageDirectory = localStorageDirectory.impl() ? localStorageDirectory.impl()->isolatedCopy() : nullptr; + RefPtr<StringImpl> copiedLocalStorageDirectory = localStorageDirectory.impl() ? localStorageDirectory.impl()->isolatedCopy() : PassRefPtr<StringImpl>(); m_queue->dispatch(bind(&LocalStorageDatabaseTracker::setLocalStorageDirectoryInternal, this, copiedLocalStorageDirectory.release())); } |