summaryrefslogtreecommitdiff
path: root/src/sync/syncassistant.cpp
diff options
context:
space:
mode:
authorSiteshwar Vashisht <siteshwar@gmail.com>2012-04-23 01:18:01 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-04-23 01:46:11 +0200
commitcd6eee46a7405bc2365ada5ca7cd2daab01e06c0 (patch)
treef9c35fedba651e15fa2550804bcd9261c5aa1a91 /src/sync/syncassistant.cpp
parentFix opensearch add shortcut handling (diff)
downloadrekonq-cd6eee46a7405bc2365ada5ca7cd2daab01e06c0.tar.xz
Google Sync Bookmarks in rekonq!
- Added UI bits to configure Google Bookamrks Sync - Implemented sync, 2-way merging local and remote bk - Remember to not update local history while remotely adding bookmarks - Encode parameters of add bookmarks request while posting data. - (adjam) fix compile warnings This is the squashed commit of Situ's work on Google Bookmarks Sync SQUASHED BY: adjam ;) REVIEW: 104673 DIGEST: Google Bookmarks Sync REVIEWED BY: adjam
Diffstat (limited to 'src/sync/syncassistant.cpp')
-rw-r--r--src/sync/syncassistant.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sync/syncassistant.cpp b/src/sync/syncassistant.cpp
index 8688d7bc..0e51e7b7 100644
--- a/src/sync/syncassistant.cpp
+++ b/src/sync/syncassistant.cpp
@@ -34,7 +34,7 @@
#include "synchosttypewidget.h"
#include "syncftpsettingswidget.h"
-
+#include "syncgooglesettingswidget.h"
SyncAssistant::SyncAssistant(QWidget *parent)
: QWizard(parent)
@@ -44,5 +44,6 @@ SyncAssistant::SyncAssistant(QWidget *parent)
setPage(Page_Data, new SyncDataWidget(this));
setPage(Page_Type, new SyncHostTypeWidget(this));
setPage(Page_FTP_Settings, new SyncFTPSettingsWidget(this));
+ setPage(Page_Google_Settings, new SyncGoogleSettingsWidget(this));
setPage(Page_Check, new SyncCheckWidget(this));
}