┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/panels
diff options
context:
space:
mode:
authorDavid Faure <[email protected]>2016-06-25 16:39:49 +0200
committerDavid Faure <[email protected]>2016-06-25 16:40:18 +0200
commite615bfaed4cd562d31ea0506529f730c414b6ec0 (patch)
treee83924de3e0a12c63f13fccf8f04bfcc39a1dd34 /src/panels
parent6bb62f17b525baf89e7f35f4f3a321876c3a31ab (diff)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation
This fixes some URLs built from local paths without scheme.
Diffstat (limited to 'src/panels')
-rw-r--r--src/panels/places/placesitem.cpp6
-rw-r--r--src/panels/places/placesitemmodel.cpp10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index a04064d0b..b32f8204d 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -276,12 +276,12 @@ void PlacesItem::initializeDevice(const QString& udi)
Solid::Block *block = m_device.as<Solid::Block>();
if (block) {
const QString device = block->device();
- setUrl(QStringLiteral("audiocd:/?device=%1").arg(device));
+ setUrl(QUrl(QStringLiteral("audiocd:/?device=%1").arg(device)));
} else {
- setUrl(QStringLiteral("audiocd:/"));
+ setUrl(QUrl(QStringLiteral("audiocd:/")));
}
} else if (m_mtp) {
- setUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()));
+ setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi())));
}
}
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index a42cb0403..25c4d51f6 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -1099,17 +1099,17 @@ QUrl PlacesItemModel::createTimelineUrl(const QUrl& url)
const int year = date.year();
const int month = date.month();
const int day = date.day();
- timelineUrl = "timeline:/" + timelineDateString(year, month) +
- '/' + timelineDateString(year, month, day);
+ timelineUrl = QUrl("timeline:/" + timelineDateString(year, month) +
+ '/' + timelineDateString(year, month, day));
} else if (path.endsWith(QLatin1String("thismonth"))) {
const QDate date = QDate::currentDate();
- timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month());
+ timelineUrl = QUrl("timeline:/" + timelineDateString(date.year(), date.month()));
} else if (path.endsWith(QLatin1String("lastmonth"))) {
const QDate date = QDate::currentDate().addMonths(-1);
- timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month());
+ timelineUrl = QUrl("timeline:/" + timelineDateString(date.year(), date.month()));
} else {
Q_ASSERT(path.endsWith(QLatin1String("today")));
- timelineUrl= url;
+ timelineUrl = url;
}
return timelineUrl;