diff options
| author | David Faure <[email protected]> | 2016-06-25 16:39:49 +0200 |
|---|---|---|
| committer | David Faure <[email protected]> | 2016-06-25 16:40:18 +0200 |
| commit | e615bfaed4cd562d31ea0506529f730c414b6ec0 (patch) | |
| tree | e83924de3e0a12c63f13fccf8f04bfcc39a1dd34 /src/panels/places/placesitemmodel.cpp | |
| parent | 6bb62f17b525baf89e7f35f4f3a321876c3a31ab (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/places/placesitemmodel.cpp')
| -rw-r--r-- | src/panels/places/placesitemmodel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; |
