Merge branch 'master' of https://github.com/worklist/hifi

Philip Rosedale committed 12 years ago

Commit cdd60de2 parents 01bef6b 8bf29f835 files · +620 −200Browse files

Showing the changes to interface/src/Application.cpp (1 of 35 files). Show all

Unified · Split

interface/src/Application.cpp+1−1

@@ -349,7 +349,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 348 unmodified lines
349		349
350	QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);	350	QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
351		351
352	NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();	352	QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
353	QNetworkDiskCache* cache = new QNetworkDiskCache();	353	QNetworkDiskCache* cache = new QNetworkDiskCache();
354	cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");	354	cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
355	networkAccessManager.setCache(cache);	355	networkAccessManager.setCache(cache);