forked from qt-creator/qt-creator
Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -36,9 +36,9 @@
|
||||
#include <utils/synchronousprocess.h>
|
||||
|
||||
#include <QDir>
|
||||
#include <QDesktopServices>
|
||||
#include <QDomDocument>
|
||||
#include <QProcess>
|
||||
#include <QStandardPaths>
|
||||
#include <QTemporaryFile>
|
||||
#include <QApplication>
|
||||
|
||||
@@ -191,9 +191,11 @@ QString QnxUtils::bbDataDirPath()
|
||||
if (Utils::HostOsInfo::isWindowsHost()) {
|
||||
// Get the proper storage location on Windows using QDesktopServices,
|
||||
// to not hardcode "AppData/Local", as it might refer to "AppData/Roaming".
|
||||
QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
|
||||
QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
|
||||
+ QLatin1String("/data");
|
||||
dataDir = dataDir.left(dataDir.indexOf(QCoreApplication::organizationName()));
|
||||
dataDir.append(QLatin1String("Research in Motion"));
|
||||
qDebug("qnx: Full data dir is '%s'", qPrintable(dataDir));
|
||||
return dataDir;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user