diff --git a/src/core/song.cpp b/src/core/song.cpp
index d8882c6e5..8167b68da 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -618,7 +618,7 @@ void Song::InitFromQuery(const SqlRow& q, bool reliable_metadata, int col) {
   d->valid_ = true;
   d->init_from_file_ = reliable_metadata;
 
-#define tostr(n) (q.value(n).isNull() ? QString::null : q.value(n).toString())
+#define tostr(n) (q.value(n).isNull() ? QString() : q.value(n).toString())
 #define toint(n) (q.value(n).isNull() ? -1 : q.value(n).toInt())
 #define tolonglong(n) (q.value(n).isNull() ? -1 : q.value(n).toLongLong())
 #define tofloat(n) (q.value(n).isNull() ? -1 : q.value(n).toDouble())
@@ -1077,13 +1077,13 @@ QString Song::PrettyTitleWithArtist() const {
 }
 
 QString Song::PrettyLength() const {
-  if (length_nanosec() == -1) return QString::null;
+  if (length_nanosec() == -1) return QString();
 
   return Utilities::PrettyTimeNanosec(length_nanosec());
 }
 
 QString Song::PrettyYear() const {
-  if (d->year_ == -1) return QString::null;
+  if (d->year_ == -1) return QString();
 
   return QString::number(d->year_);
 }
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index e0383b4e1..33ca29659 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -396,7 +396,7 @@ QString GetConfigPath(ConfigPath config) {
 
     default:
       qFatal("%s", Q_FUNC_INFO);
-      return QString::null;
+      return QString();
   }
 }
 
diff --git a/src/covers/kittenloader.cpp b/src/covers/kittenloader.cpp
index ac6902309..435123be0 100644
--- a/src/covers/kittenloader.cpp
+++ b/src/covers/kittenloader.cpp
@@ -45,7 +45,7 @@ quint64 KittenLoader::LoadKitten(const AlbumCoverLoaderOptions& options) {
   if (!kitten_urls_.isEmpty()) {
     QUrl url = kitten_urls_.dequeue();
     return AlbumCoverLoader::LoadImageAsync(
-        options, QString::null, url.toString(), QString::null, QImage());
+        options, QString(), url.toString(), QString(), QImage());
   }
 
   Task task;
diff --git a/src/internet/box/boxservice.cpp b/src/internet/box/boxservice.cpp
index 65eae3f6d..ace05655e 100644
--- a/src/internet/box/boxservice.cpp
+++ b/src/internet/box/boxservice.cpp
@@ -88,7 +88,7 @@ void BoxService::Connect() {
     oauth->RefreshAuthorisation(kOAuthTokenEndpoint, refresh_token());
   } else {
     oauth->StartAuthorisation(kOAuthEndpoint, kOAuthTokenEndpoint,
-                              QString::null);
+                              QString());
   }
 
   NewClosure(oauth, SIGNAL(Finished()), this,
diff --git a/src/internet/core/cloudfileservice.cpp b/src/internet/core/cloudfileservice.cpp
index 896abf14e..68467ded2 100644
--- a/src/internet/core/cloudfileservice.cpp
+++ b/src/internet/core/cloudfileservice.cpp
@@ -58,8 +58,8 @@ CloudFileService::CloudFileService(Application* app, InternetModel* parent,
   QString songs_table = service_id + "_songs";
   QString songs_fts_table = service_id + "_songs_fts";
 
-  library_backend_->Init(app->database(), songs_table, QString::null,
-                         QString::null, songs_fts_table);
+  library_backend_->Init(app->database(), songs_table, QString(),
+                         QString(), songs_fts_table);
   library_model_ = new LibraryModel(library_backend_, app_, this);
 
   library_sort_model_->setSourceModel(library_model_);
@@ -232,7 +232,7 @@ QString CloudFileService::GuessMimeTypeForFile(const QString& filename) const {
   } else if (filename.endsWith(".wma", Qt::CaseInsensitive)) {
     return "audio/x-ms-wma";
   }
-  return QString::null;
+  return QString();
 }
 
 void CloudFileService::AbortReadTagsReplies() {
diff --git a/src/internet/dropbox/dropboxservice.cpp b/src/internet/dropbox/dropboxservice.cpp
index 21c0fa785..d74e52ff5 100644
--- a/src/internet/dropbox/dropboxservice.cpp
+++ b/src/internet/dropbox/dropboxservice.cpp
@@ -259,7 +259,7 @@ void DropboxService::FetchContentUrlFinished(QNetworkReply* reply,
 
   MaybeAddFileToDatabase(song, GuessMimeTypeForFile(url.toString()),
                          QUrl::fromEncoded(json_response["link"].toVariant().toByteArray()),
-                         QString::null);
+                         QString());
 }
 
 QUrl DropboxService::GetStreamingUrlFromSongId(const QUrl& url) {
diff --git a/src/internet/jamendo/jamendoservice.cpp b/src/internet/jamendo/jamendoservice.cpp
index eea8635e5..57491abd7 100644
--- a/src/internet/jamendo/jamendoservice.cpp
+++ b/src/internet/jamendo/jamendoservice.cpp
@@ -92,8 +92,8 @@ JamendoService::JamendoService(Application* app, InternetModel* parent)
       accepted_download_(false) {
   library_backend_ = new LibraryBackend;
   library_backend_->moveToThread(app_->database()->thread());
-  library_backend_->Init(app_->database(), kSongsTable, QString::null,
-                         QString::null, kFtsTable);
+  library_backend_->Init(app_->database(), kSongsTable, QString(),
+                         QString(), kFtsTable);
   connect(library_backend_, SIGNAL(TotalSongCountUpdated(int)),
           SLOT(UpdateTotalSongCount(int)));
 
diff --git a/src/internet/magnatune/magnatuneservice.cpp b/src/internet/magnatune/magnatuneservice.cpp
index 1724b4d0b..873232af2 100644
--- a/src/internet/magnatune/magnatuneservice.cpp
+++ b/src/internet/magnatune/magnatuneservice.cpp
@@ -91,8 +91,8 @@ MagnatuneService::MagnatuneService(Application* app, InternetModel* parent)
   // Create the library backend in the database thread
   library_backend_ = new LibraryBackend;
   library_backend_->moveToThread(app_->database()->thread());
-  library_backend_->Init(app_->database(), kSongsTable, QString::null,
-                         QString::null, kFtsTable);
+  library_backend_->Init(app_->database(), kSongsTable, QString(),
+                         QString(), kFtsTable);
   library_model_ = new LibraryModel(library_backend_, app_, this);
 
   connect(library_backend_, SIGNAL(TotalSongCountUpdated(int)),
diff --git a/src/internet/seafile/seafiletree.cpp b/src/internet/seafile/seafiletree.cpp
index 82479e9f4..1a10eac20 100644
--- a/src/internet/seafile/seafiletree.cpp
+++ b/src/internet/seafile/seafiletree.cpp
@@ -264,7 +264,7 @@ QString SeafileTree::Entry::TypeToString(const Type& type) {
     case LIBRARY:
       return "library";
     default:
-      return QString::null;
+      return QString();
   }
 }
 
diff --git a/src/internet/skydrive/skydriveservice.cpp b/src/internet/skydrive/skydriveservice.cpp
index 3e8c43710..091665037 100644
--- a/src/internet/skydrive/skydriveservice.cpp
+++ b/src/internet/skydrive/skydriveservice.cpp
@@ -162,7 +162,7 @@ void SkydriveService::ListFilesFinished(QNetworkReply* reply) {
       // HTTPS appears to be broken somehow between Qt & Skydrive downloads.
       // Fortunately, just changing the scheme to HTTP works.
       download_url.setScheme("http");
-      MaybeAddFileToDatabase(song, mime_type, download_url, QString::null);
+      MaybeAddFileToDatabase(song, mime_type, download_url, QString());
     }
   }
 }
diff --git a/src/internet/subsonic/subsonicservice.cpp b/src/internet/subsonic/subsonicservice.cpp
index aa9c00511..37e90510c 100644
--- a/src/internet/subsonic/subsonicservice.cpp
+++ b/src/internet/subsonic/subsonicservice.cpp
@@ -83,8 +83,8 @@ SubsonicService::SubsonicService(Application* app, InternetModel* parent)
 
   library_backend_ = new LibraryBackend;
   library_backend_->moveToThread(app_->database()->thread());
-  library_backend_->Init(app_->database(), kSongsTable, QString::null,
-                         QString::null, kFtsTable);
+  library_backend_->Init(app_->database(), kSongsTable, QString(),
+                         QString(), kFtsTable);
   connect(library_backend_, SIGNAL(TotalSongCountUpdated(int)),
           SLOT(UpdateTotalSongCount(int)));
 
diff --git a/src/networkremote/avahi.cpp b/src/networkremote/avahi.cpp
index d126aa2a4..fcf794718 100644
--- a/src/networkremote/avahi.cpp
+++ b/src/networkremote/avahi.cpp
@@ -52,7 +52,7 @@ void AddService(const QString domain, const QString type, const QByteArray name,
       QString::fromUtf8(name.constData(), name.size()),
       type,                  // Service type, eg. _clementine._tcp
       domain,                // Domain, eg. local
-      QString::null,         // Hostname (filled in by Avahi)
+      QString(),             // Hostname (filled in by Avahi)
       port,                  // Port our service is running on
       QList<QByteArray>());  // TXT record
   QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(reply);
diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp
index ab48157c4..238e71954 100644
--- a/src/playlist/playlistdelegates.cpp
+++ b/src/playlist/playlistdelegates.cpp
@@ -264,7 +264,7 @@ QString LengthItemDelegate::displayText(const QVariant& value,
   qint64 nanoseconds = value.toLongLong(&ok);
 
   if (ok && nanoseconds > 0) return Utilities::PrettyTimeNanosec(nanoseconds);
-  return QString::null;
+  return QString();
 }
 
 QString SizeItemDelegate::displayText(const QVariant& value,
@@ -281,7 +281,7 @@ QString DateItemDelegate::displayText(const QVariant& value,
   bool ok = false;
   int time = value.toInt(&ok);
 
-  if (!ok || time == -1) return QString::null;
+  if (!ok || time == -1) return QString();
 
   return QDateTime::fromTime_t(time)
       .toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
diff --git a/src/songinfo/artistbiography.cpp b/src/songinfo/artistbiography.cpp
index 33fcec221..e5a0b693a 100644
--- a/src/songinfo/artistbiography.cpp
+++ b/src/songinfo/artistbiography.cpp
@@ -173,7 +173,7 @@ QString ExtractExtract(const QJsonObject& json) {
       return it.value().toString();
     }
   }
-  return QString::null;
+  return QString();
 }
 
 }  // namespace
diff --git a/src/ui/addstreamdialog.cpp b/src/ui/addstreamdialog.cpp
index e33837f91..d5a06e83e 100644
--- a/src/ui/addstreamdialog.cpp
+++ b/src/ui/addstreamdialog.cpp
@@ -32,7 +32,7 @@ AddStreamDialog::AddStreamDialog(QWidget* parent)
   ui_->setupUi(this);
 
   connect(ui_->url, SIGNAL(textChanged(QString)), SLOT(TextChanged(QString)));
-  TextChanged(QString::null);
+  TextChanged(QString());
 
   // Restore settings
   QSettings s;
diff --git a/src/widgets/busyindicator.cpp b/src/widgets/busyindicator.cpp
index cc627a130..f6d786fca 100644
--- a/src/widgets/busyindicator.cpp
+++ b/src/widgets/busyindicator.cpp
@@ -26,7 +26,7 @@ BusyIndicator::BusyIndicator(const QString& text, QWidget* parent)
 }
 
 BusyIndicator::BusyIndicator(QWidget* parent) : QWidget(parent) {
-  Init(QString::null);
+  Init(QString());
 }
 
 void BusyIndicator::Init(const QString& text) {
diff --git a/src/widgets/loginstatewidget.h b/src/widgets/loginstatewidget.h
index 64d3e3018..0b203f09a 100644
--- a/src/widgets/loginstatewidget.h
+++ b/src/widgets/loginstatewidget.h
@@ -46,7 +46,7 @@ class LoginStateWidget : public QWidget {
  public slots:
   // Changes the "You are logged in/out" label, shows/hides any QGroupBoxes
   // added with AddCredentialGroup.
-  void SetLoggedIn(State state, const QString& account_name = QString::null);
+  void SetLoggedIn(State state, const QString& account_name = QString());
 
   // Hides the "You are logged in/out" label completely.
   void HideLoggedInState();