Fixup for GoogleDrive on QT < 5.4

.. rather than only build with Google Drive support if using QT5.4 just adapt the code to avoid issues with QJsonObject -> operator present in QT5.x < 5.4. .. see https://bugreports.qt.io/browse/QTBUG-29573
Autositz · Mar 3, 2016 · 6025681 · 6025681
1 parent 4fa8828
commit 6025681
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/src/Cloud/GoogleDrive.cpp b/src/Cloud/GoogleDrive.cpp
@@ -231,7 +231,7 @@ GoogleDrive::FileInfo* GoogleDrive::WalkFileInfo(const QString& path,
         if (child == target->children.end()) {
             // Directory doesn't exist!
             printd("Bailing, because I couldn't find: %s in %s\n",
-                   it->toStdString().c_str(),
+                   (*it).toStdString().c_str(),
                    target->name.toStdString().c_str());
             if (foo) {
                 return target;
@@ -338,11 +338,11 @@ QList<FileStoreEntry*> GoogleDrive::readdir(QString path, QStringList &errors) {
         QJsonObject file = contents.at(i).toObject();
         // Some paranoia.
         QJsonObject::iterator it = file.find("trashed");
-        if (it != file.end() && it->toString() == "true") {
+        if (it != file.end() && (*it).toString() == "true") {
             continue;
         }
         it = file.find("explicitlyTrashed");
-        if (it != file.end() && it->toString() == "true") {
+        if (it != file.end() && (*it).toString() == "true") {
             continue;
         }
         QSharedPointer<FileInfo> fi(new FileInfo);
@@ -357,7 +357,7 @@ QList<FileStoreEntry*> GoogleDrive::readdir(QString path, QStringList &errors) {
             fi->parent = GetRootDirId();
         }
         it = file.find("mimeType");
-        if (it != file.end() && it->toString() == kDirectoryMimeType) {
+        if (it != file.end() && (*it).toString() == kDirectoryMimeType) {
             fi->is_dir = true;
         } else {
             fi->is_dir = false;

diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
@@ -81,8 +81,6 @@
 #include "CalendarDownload.h"
 #if QT_VERSION > 0x050000
 #include "Dropbox.h"
-#endif
-#if QT_VERSION >= 0x050400
 #include "GoogleDrive.h"
 #endif
 #include "LocalFileStore.h"
@@ -560,11 +558,11 @@ MainWindow::MainWindow(const QDir &home)
     shareMenu->addSeparator ();
     shareMenu->addAction(tr("Upload to &Dropbox"), this, SLOT(uploadDropbox()), tr("Ctrl+R"));
     shareMenu->addAction(tr("Synchronise Dropbox..."), this, SLOT(syncDropbox()), tr("Ctrl+O"));
-#endif
-#if QT_VERSION > 0x050400
     shareMenu->addSeparator ();
-    shareMenu->addAction(tr("Upload to &GoogleDrive"), this, SLOT(uploadGoogleDrive()), tr(""));
-    shareMenu->addAction(tr("Synchronise GoogleDrive..."), this, SLOT(syncGoogleDrive()), tr("Ctrl+P"));
+    shareMenu->addAction(tr("Upload to &GoogleDrive"), this,
+                         SLOT(uploadGoogleDrive()), tr(""));
+    shareMenu->addAction(tr("Synchronise GoogleDrive..."), this,
+                         SLOT(syncGoogleDrive()), tr("Ctrl+P"));
 #endif
 #ifdef GC_HAVE_SOAP
     shareMenu->addSeparator ();
@@ -2071,9 +2069,7 @@ MainWindow::syncDropbox()
     FileStoreSyncDialog upload(currentTab->context, &db);
     upload.exec();
 }
-#endif
 
-#if QT_VERSION > 0x050400
 void
 MainWindow::uploadGoogleDrive()
 {

diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h
@@ -205,9 +205,7 @@ class MainWindow : public QMainWindow
 #if QT_VERSION > 0x050000
         void uploadDropbox();
         void syncDropbox();
-#endif
 
-#if QT_VERSION >= 0x050400
         void uploadGoogleDrive();
         void syncGoogleDrive();
 #endif

diff --git a/src/src.pro b/src/src.pro
@@ -519,17 +519,13 @@ equals(CloudDB, active) {
 
 greaterThan(QT_MAJOR_VERSION, 4) {
 
-    # Features that only work with QT5.0 or higher
+    # Features that only work with QT5 or higher
     SOURCES += Cloud/Dropbox.cpp
     HEADERS += Cloud/Dropbox.h
+    SOURCES += Cloud/GoogleDrive.cpp
+    HEADERS += Cloud/GoogleDrive.h
     SOURCES += Train/Monark.cpp Train/MonarkController.cpp Train/MonarkConnection.cpp
     HEADERS += Train/Monark.h Train/MonarkController.h Train/MonarkConnection.h
-
-    # GoogleDrive needs QT5.4 or higher
-    greaterThan(QT_MINOR_VERSION, 3) {
-        SOURCES += Cloud/GoogleDrive.cpp
-        HEADERS += Cloud/GoogleDrive.h
-    }
 }