Make snowshoe capable of loading two UIs.

The common stuff is located in core/ in a static lib (could be ported also
later transformed as a QML plugin). Each ui has its own subdir.
You can load each UI by calling ./snowshoe --mobile or ./snowshoe --desktop.
Default fallback to desktop.

Reviewed-by: Caio Oliveira

93 files changed, 175 insertions, 52 deletions

diff --git a/src/ApplicationStateTracker.cpp b/src/core/ApplicationStateTracker.cpp
index 8e1a5b8..8e1a5b8 100644
--- a/src/ApplicationStateTracker.cpp
+++ b/src/core/ApplicationStateTracker.cpp
diff --git a/src/ApplicationStateTracker.h b/src/core/ApplicationStateTracker.h
index fadb9ae..fadb9ae 100644
--- a/src/ApplicationStateTracker.h
+++ b/src/core/ApplicationStateTracker.h
diff --git a/src/BookmarkFilter.cpp b/src/core/BookmarkFilter.cpp
index 8288586..8288586 100644
--- a/src/BookmarkFilter.cpp
+++ b/src/core/BookmarkFilter.cpp
diff --git a/src/BookmarkFilter.h b/src/core/BookmarkFilter.h
index a882862..a882862 100644
--- a/src/BookmarkFilter.h
+++ b/src/core/BookmarkFilter.h
diff --git a/src/BookmarkModel.cpp b/src/core/BookmarkModel.cpp
index 2a150cd..2a150cd 100644
--- a/src/BookmarkModel.cpp
+++ b/src/core/BookmarkModel.cpp
diff --git a/src/BookmarkModel.h b/src/core/BookmarkModel.h
index f6e3cb9..f6e3cb9 100644
--- a/src/BookmarkModel.h
+++ b/src/core/BookmarkModel.h
diff --git a/src/DatabaseManager.cpp b/src/core/DatabaseManager.cpp
index aa5e2db..aa5e2db 100644
--- a/src/DatabaseManager.cpp
+++ b/src/core/DatabaseManager.cpp
diff --git a/src/DatabaseManager.h b/src/core/DatabaseManager.h
index 25d0e0e..25d0e0e 100644
--- a/src/DatabaseManager.h
+++ b/src/core/DatabaseManager.h
diff --git a/src/PopupWindow.cpp b/src/core/PopupWindow.cpp
index 221355f..221355f 100644
--- a/src/PopupWindow.cpp
+++ b/src/core/PopupWindow.cpp
diff --git a/src/PopupWindow.h b/src/core/PopupWindow.h
index 189adb3..189adb3 100644
--- a/src/PopupWindow.h
+++ b/src/core/PopupWindow.h
diff --git a/src/UrlTools.h b/src/core/UrlTools.h
index 6272278..6272278 100644
--- a/src/UrlTools.h
+++ b/src/core/UrlTools.h
diff --git a/src/core/core.pro b/src/core/core.pro
new file mode 100644
index 0000000..daa8f53
--- /dev/null
+++ b/src/core/core.pro
@@ -0,0 +1,20 @@
+TEMPLATE = lib
+CONFIG = staticlib qt
+TARGET= snowshoe
+
+QT +=  declarative sql widgets quick
+
+SOURCES += \
+    ApplicationStateTracker.cpp \
+    BookmarkFilter.cpp \
+    BookmarkModel.cpp \
+    DatabaseManager.cpp \
+    PopupWindow.cpp
+
+HEADERS += \
+    ApplicationStateTracker.h \
+    BookmarkFilter.h \
+    BookmarkModel.h \
+    DatabaseManager.h \
+    PopupWindow.h \
+    UrlTools.h 
diff --git a/src/BrowserWindow.cpp b/src/desktop/BrowserWindow.cpp
index 3204b3b..5cf2094 100644
--- a/src/BrowserWindow.cpp
+++ b/src/desktop/BrowserWindow.cpp
@@ -19,6 +19,7 @@
 
 #include "BookmarkModel.h"
 #include "DatabaseManager.h"
+#include "Shortcut.h"
 #include "UrlTools.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
@@ -36,6 +37,7 @@ BrowserWindow::BrowserWindow(const QStringList& arguments)
     : m_urlsFromCommandLine(arguments)
     , m_browserView(0)
 {
+    qmlRegisterType<Shortcut>("Snowshoe", 1, 0, "Shortcut");
     restoreWindowGeometry();
     setupDeclarativeEnvironment();
     m_browserView = qobject_cast<QQuickItem*>(rootObject());
diff --git a/src/BrowserWindow.h b/src/desktop/BrowserWindow.h
index ec87432..ec87432 100644
--- a/src/BrowserWindow.h
+++ b/src/desktop/BrowserWindow.h
diff --git a/src/Shortcut.cpp b/src/desktop/Shortcut.cpp
index b4d62d0..b4d62d0 100644
--- a/src/Shortcut.cpp
+++ b/src/desktop/Shortcut.cpp
diff --git a/src/Shortcut.h b/src/desktop/Shortcut.h
index 6a4dbe5..6a4dbe5 100644
--- a/src/Shortcut.h
+++ b/src/desktop/Shortcut.h
diff --git a/src/images/bookmark/bookmark_btn_dropdown_menu_over.png b/src/desktop/images/bookmark/bookmark_btn_dropdown_menu_over.png
index c142764..c142764 100644
--- a/src/images/bookmark/bookmark_btn_dropdown_menu_over.png
+++ b/src/desktop/images/bookmark/bookmark_btn_dropdown_menu_over.png
diff --git a/src/images/bookmark/bookmark_btn_dropdown_menu_static.png b/src/desktop/images/bookmark/bookmark_btn_dropdown_menu_static.png
index 831e5e8..831e5e8 100644
--- a/src/images/bookmark/bookmark_btn_dropdown_menu_static.png
+++ b/src/desktop/images/bookmark/bookmark_btn_dropdown_menu_static.png
diff --git a/src/images/bookmark/bookmark_header_bg.png b/src/desktop/images/bookmark/bookmark_header_bg.png
index b89305c..b89305c 100644
--- a/src/images/bookmark/bookmark_header_bg.png
+++ b/src/desktop/images/bookmark/bookmark_header_bg.png
diff --git a/src/images/bookmark/bookmark_header_divisor.png b/src/desktop/images/bookmark/bookmark_header_divisor.png
index 9dd220b..9dd220b 100644
--- a/src/images/bookmark/bookmark_header_divisor.png
+++ b/src/desktop/images/bookmark/bookmark_header_divisor.png
diff --git a/src/images/bookmark/bookmark_over_bg.png b/src/desktop/images/bookmark/bookmark_over_bg.png
index fef8f73..fef8f73 100644
--- a/src/images/bookmark/bookmark_over_bg.png
+++ b/src/desktop/images/bookmark/bookmark_over_bg.png
diff --git a/src/images/bookmark/bookmark_over_mask.png b/src/desktop/images/bookmark/bookmark_over_mask.png
index 5913279..5913279 100644
--- a/src/images/bookmark/bookmark_over_mask.png
+++ b/src/desktop/images/bookmark/bookmark_over_mask.png
diff --git a/src/images/bookmark/bookmark_static_bg.png b/src/desktop/images/bookmark/bookmark_static_bg.png
index bafb2ca..bafb2ca 100644
--- a/src/images/bookmark/bookmark_static_bg.png
+++ b/src/desktop/images/bookmark/bookmark_static_bg.png
diff --git a/src/images/bookmark/bookmark_static_mask.png b/src/desktop/images/bookmark/bookmark_static_mask.png
index 30070d3..30070d3 100644
--- a/src/images/bookmark/bookmark_static_mask.png
+++ b/src/desktop/images/bookmark/bookmark_static_mask.png
diff --git a/src/images/combobox/combo_icon_scroll_down_over.png b/src/desktop/images/combobox/combo_icon_scroll_down_over.png
index a77abde..a77abde 100644
--- a/src/images/combobox/combo_icon_scroll_down_over.png
+++ b/src/desktop/images/combobox/combo_icon_scroll_down_over.png
diff --git a/src/images/combobox/combo_icon_scroll_down_static.png b/src/desktop/images/combobox/combo_icon_scroll_down_static.png
index 9ab76af..9ab76af 100644
--- a/src/images/combobox/combo_icon_scroll_down_static.png
+++ b/src/desktop/images/combobox/combo_icon_scroll_down_static.png
diff --git a/src/images/combobox/combo_icon_scroll_up_over.png b/src/desktop/images/combobox/combo_icon_scroll_up_over.png
index 4d17ae4..4d17ae4 100644
--- a/src/images/combobox/combo_icon_scroll_up_over.png
+++ b/src/desktop/images/combobox/combo_icon_scroll_up_over.png
diff --git a/src/images/combobox/combo_icon_scroll_up_static.png b/src/desktop/images/combobox/combo_icon_scroll_up_static.png
index 7a203e3..7a203e3 100644
--- a/src/images/combobox/combo_icon_scroll_up_static.png
+++ b/src/desktop/images/combobox/combo_icon_scroll_up_static.png
diff --git a/src/images/combobox/combobox_base_bg.png b/src/desktop/images/combobox/combobox_base_bg.png
index 87c654b..87c654b 100644
--- a/src/images/combobox/combobox_base_bg.png
+++ b/src/desktop/images/combobox/combobox_base_bg.png
diff --git a/src/images/combobox/combobox_btn_scroll_over.png b/src/desktop/images/combobox/combobox_btn_scroll_over.png
index 1fe12dd..1fe12dd 100644
--- a/src/images/combobox/combobox_btn_scroll_over.png
+++ b/src/desktop/images/combobox/combobox_btn_scroll_over.png
diff --git a/src/images/combobox/combobox_btn_scroll_static.png b/src/desktop/images/combobox/combobox_btn_scroll_static.png
index c39ed24..c39ed24 100644
--- a/src/images/combobox/combobox_btn_scroll_static.png
+++ b/src/desktop/images/combobox/combobox_btn_scroll_static.png
diff --git a/src/images/combobox/combobox_divisor.png b/src/desktop/images/combobox/combobox_divisor.png
index 85c144a..85c144a 100644
--- a/src/images/combobox/combobox_divisor.png
+++ b/src/desktop/images/combobox/combobox_divisor.png
diff --git a/src/images/combobox/combobox_item_over_bg.png b/src/desktop/images/combobox/combobox_item_over_bg.png
index 6e4c9a2..6e4c9a2 100644
--- a/src/images/combobox/combobox_item_over_bg.png
+++ b/src/desktop/images/combobox/combobox_item_over_bg.png
diff --git a/src/images/pagewidget/link_status_bg_left.png b/src/desktop/images/pagewidget/link_status_bg_left.png
index 2f53586..2f53586 100644
--- a/src/images/pagewidget/link_status_bg_left.png
+++ b/src/desktop/images/pagewidget/link_status_bg_left.png
diff --git a/src/images/pagewidget/link_status_bg_right.png b/src/desktop/images/pagewidget/link_status_bg_right.png
index 3ab2dcb..3ab2dcb 100644
--- a/src/images/pagewidget/link_status_bg_right.png
+++ b/src/desktop/images/pagewidget/link_status_bg_right.png
diff --git a/src/images/tabwidget/spinner.gif b/src/desktop/images/tabwidget/spinner.gif
index 368116e..368116e 100644
--- a/src/images/tabwidget/spinner.gif
+++ b/src/desktop/images/tabwidget/spinner.gif
diff --git a/src/images/tabwidget/tab_active_btn_close.png b/src/desktop/images/tabwidget/tab_active_btn_close.png
index 1b59f55..1b59f55 100644
--- a/src/images/tabwidget/tab_active_btn_close.png
+++ b/src/desktop/images/tabwidget/tab_active_btn_close.png
diff --git a/src/images/tabwidget/tab_active_fill.png b/src/desktop/images/tabwidget/tab_active_fill.png
index 2921a28..2921a28 100644
--- a/src/images/tabwidget/tab_active_fill.png
+++ b/src/desktop/images/tabwidget/tab_active_fill.png
diff --git a/src/images/tabwidget/tab_active_left.png b/src/desktop/images/tabwidget/tab_active_left.png
index 329e743..329e743 100755
--- a/src/images/tabwidget/tab_active_left.png
+++ b/src/desktop/images/tabwidget/tab_active_left.png
diff --git a/src/images/tabwidget/tab_active_right.png b/src/desktop/images/tabwidget/tab_active_right.png
index a0d3339..a0d3339 100644
--- a/src/images/tabwidget/tab_active_right.png
+++ b/src/desktop/images/tabwidget/tab_active_right.png
diff --git a/src/images/tabwidget/tab_active_with_inactive_left.png b/src/desktop/images/tabwidget/tab_active_with_inactive_left.png
index 834d0eb..834d0eb 100644
--- a/src/images/tabwidget/tab_active_with_inactive_left.png
+++ b/src/desktop/images/tabwidget/tab_active_with_inactive_left.png
diff --git a/src/images/tabwidget/tab_active_with_inactive_right.png b/src/desktop/images/tabwidget/tab_active_with_inactive_right.png
index 8ace092..8ace092 100644
--- a/src/images/tabwidget/tab_active_with_inactive_right.png
+++ b/src/desktop/images/tabwidget/tab_active_with_inactive_right.png
diff --git a/src/images/tabwidget/tab_base_fill.png b/src/desktop/images/tabwidget/tab_base_fill.png
index 57f1bfa..57f1bfa 100644
--- a/src/images/tabwidget/tab_base_fill.png
+++ b/src/desktop/images/tabwidget/tab_base_fill.png
diff --git a/src/images/tabwidget/tab_inactive_btn_close.png b/src/desktop/images/tabwidget/tab_inactive_btn_close.png
index 7533795..7533795 100644
--- a/src/images/tabwidget/tab_inactive_btn_close.png
+++ b/src/desktop/images/tabwidget/tab_inactive_btn_close.png
diff --git a/src/images/tabwidget/tab_inactive_fill.png b/src/desktop/images/tabwidget/tab_inactive_fill.png
index a709bd8..a709bd8 100644
--- a/src/images/tabwidget/tab_inactive_fill.png
+++ b/src/desktop/images/tabwidget/tab_inactive_fill.png
diff --git a/src/images/tabwidget/tab_inactive_left.png b/src/desktop/images/tabwidget/tab_inactive_left.png
index b53304f..b53304f 100755
--- a/src/images/tabwidget/tab_inactive_left.png
+++ b/src/desktop/images/tabwidget/tab_inactive_left.png
diff --git a/src/images/tabwidget/tab_inactive_right.png b/src/desktop/images/tabwidget/tab_inactive_right.png
index 6255835..6255835 100644
--- a/src/images/tabwidget/tab_inactive_right.png
+++ b/src/desktop/images/tabwidget/tab_inactive_right.png
diff --git a/src/images/tabwidget/tab_inactive_with_inactive.png b/src/desktop/images/tabwidget/tab_inactive_with_inactive.png
index c690818..c690818 100644
--- a/src/images/tabwidget/tab_inactive_with_inactive.png
+++ b/src/desktop/images/tabwidget/tab_inactive_with_inactive.png
diff --git a/src/images/urlbar/component_btn_nav_back_disable.png b/src/desktop/images/urlbar/component_btn_nav_back_disable.png
index d5d105a..d5d105a 100755
--- a/src/images/urlbar/component_btn_nav_back_disable.png
+++ b/src/desktop/images/urlbar/component_btn_nav_back_disable.png
diff --git a/src/images/urlbar/component_btn_nav_back_over.png b/src/desktop/images/urlbar/component_btn_nav_back_over.png
index 8578377..8578377 100755
--- a/src/images/urlbar/component_btn_nav_back_over.png
+++ b/src/desktop/images/urlbar/component_btn_nav_back_over.png
diff --git a/src/images/urlbar/component_btn_nav_back_pressed.png b/src/desktop/images/urlbar/component_btn_nav_back_pressed.png
index ea08288..ea08288 100755
--- a/src/images/urlbar/component_btn_nav_back_pressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_back_pressed.png
diff --git a/src/images/urlbar/component_btn_nav_back_unpressed.png b/src/desktop/images/urlbar/component_btn_nav_back_unpressed.png
index 2c59cd8..2c59cd8 100755
--- a/src/images/urlbar/component_btn_nav_back_unpressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_back_unpressed.png
diff --git a/src/images/urlbar/component_btn_nav_cancel_disable.png b/src/desktop/images/urlbar/component_btn_nav_cancel_disable.png
index 0bc9aa7..0bc9aa7 100755
--- a/src/images/urlbar/component_btn_nav_cancel_disable.png
+++ b/src/desktop/images/urlbar/component_btn_nav_cancel_disable.png
diff --git a/src/images/urlbar/component_btn_nav_cancel_over.png b/src/desktop/images/urlbar/component_btn_nav_cancel_over.png
index f547fdc..f547fdc 100755
--- a/src/images/urlbar/component_btn_nav_cancel_over.png
+++ b/src/desktop/images/urlbar/component_btn_nav_cancel_over.png
diff --git a/src/images/urlbar/component_btn_nav_cancel_pressed.png b/src/desktop/images/urlbar/component_btn_nav_cancel_pressed.png
index 0cf2aca..0cf2aca 100755
--- a/src/images/urlbar/component_btn_nav_cancel_pressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_cancel_pressed.png
diff --git a/src/images/urlbar/component_btn_nav_cancel_unpressed.png b/src/desktop/images/urlbar/component_btn_nav_cancel_unpressed.png
index a66b083..a66b083 100755
--- a/src/images/urlbar/component_btn_nav_cancel_unpressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_cancel_unpressed.png
diff --git a/src/images/urlbar/component_btn_nav_next_disable.png b/src/desktop/images/urlbar/component_btn_nav_next_disable.png
index de7b985..de7b985 100755
--- a/src/images/urlbar/component_btn_nav_next_disable.png
+++ b/src/desktop/images/urlbar/component_btn_nav_next_disable.png
diff --git a/src/images/urlbar/component_btn_nav_next_over.png b/src/desktop/images/urlbar/component_btn_nav_next_over.png
index abe6788..abe6788 100755
--- a/src/images/urlbar/component_btn_nav_next_over.png
+++ b/src/desktop/images/urlbar/component_btn_nav_next_over.png
diff --git a/src/images/urlbar/component_btn_nav_next_pressed.png b/src/desktop/images/urlbar/component_btn_nav_next_pressed.png
index 6555de1..6555de1 100755
--- a/src/images/urlbar/component_btn_nav_next_pressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_next_pressed.png
diff --git a/src/images/urlbar/component_btn_nav_next_unpressed.png b/src/desktop/images/urlbar/component_btn_nav_next_unpressed.png
index eae8761..eae8761 100755
--- a/src/images/urlbar/component_btn_nav_next_unpressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_next_unpressed.png
diff --git a/src/images/urlbar/component_btn_nav_refresh_disable.png b/src/desktop/images/urlbar/component_btn_nav_refresh_disable.png
index b509f4a..b509f4a 100755
--- a/src/images/urlbar/component_btn_nav_refresh_disable.png
+++ b/src/desktop/images/urlbar/component_btn_nav_refresh_disable.png
diff --git a/src/images/urlbar/component_btn_nav_refresh_over.png b/src/desktop/images/urlbar/component_btn_nav_refresh_over.png
index fa04c43..fa04c43 100755
--- a/src/images/urlbar/component_btn_nav_refresh_over.png
+++ b/src/desktop/images/urlbar/component_btn_nav_refresh_over.png
diff --git a/src/images/urlbar/component_btn_nav_refresh_pressed.png b/src/desktop/images/urlbar/component_btn_nav_refresh_pressed.png
index b7a9ae6..b7a9ae6 100755
--- a/src/images/urlbar/component_btn_nav_refresh_pressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_refresh_pressed.png
diff --git a/src/images/urlbar/component_btn_nav_refresh_unpressed.png b/src/desktop/images/urlbar/component_btn_nav_refresh_unpressed.png
index 01458c0..01458c0 100755
--- a/src/images/urlbar/component_btn_nav_refresh_unpressed.png
+++ b/src/desktop/images/urlbar/component_btn_nav_refresh_unpressed.png
diff --git a/src/desktop/images/urlbar/component_btn_settings.png b/src/desktop/images/urlbar/component_btn_settings.png
new file mode 100755
index 0000000..87f6e2f
--- /dev/null
+++ b/src/desktop/images/urlbar/component_btn_settings.png
diff --git a/src/images/urlbar/component_divisor.png b/src/desktop/images/urlbar/component_divisor.png
index d6fdf56..d6fdf56 100755
--- a/src/images/urlbar/component_divisor.png
+++ b/src/desktop/images/urlbar/component_divisor.png
diff --git a/src/images/urlbar/component_url_input.png b/src/desktop/images/urlbar/component_url_input.png
index 36a61f1..36a61f1 100644
--- a/src/images/urlbar/component_url_input.png
+++ b/src/desktop/images/urlbar/component_url_input.png
diff --git a/src/images/urlbar/fav_icon_off.png b/src/desktop/images/urlbar/fav_icon_off.png
index 6dcb870..6dcb870 100644
--- a/src/images/urlbar/fav_icon_off.png
+++ b/src/desktop/images/urlbar/fav_icon_off.png
diff --git a/src/images/urlbar/fav_icon_on.png b/src/desktop/images/urlbar/fav_icon_on.png
index d3fe0a1..d3fe0a1 100644
--- a/src/images/urlbar/fav_icon_on.png
+++ b/src/desktop/images/urlbar/fav_icon_on.png
diff --git a/src/images/urlbar/progress_bar_url.png b/src/desktop/images/urlbar/progress_bar_url.png
index d5f6198..d5f6198 100644
--- a/src/images/urlbar/progress_bar_url.png
+++ b/src/desktop/images/urlbar/progress_bar_url.png
diff --git a/src/images/urlbar/url_bg_base_fill.png b/src/desktop/images/urlbar/url_bg_base_fill.png
index 402bb91..402bb91 100755
--- a/src/images/urlbar/url_bg_base_fill.png
+++ b/src/desktop/images/urlbar/url_bg_base_fill.png
diff --git a/src/qml/BookmarkBar.qml b/src/desktop/qml/BookmarkBar.qml
index 5e94d83..5e94d83 100644
--- a/src/qml/BookmarkBar.qml
+++ b/src/desktop/qml/BookmarkBar.qml
diff --git a/src/qml/BookmarkBarDelegate.qml b/src/desktop/qml/BookmarkBarDelegate.qml
index 37bcac1..37bcac1 100644
--- a/src/qml/BookmarkBarDelegate.qml
+++ b/src/desktop/qml/BookmarkBarDelegate.qml
diff --git a/src/qml/Button.qml b/src/desktop/qml/Button.qml
index ecd2763..ecd2763 100644
--- a/src/qml/Button.qml
+++ b/src/desktop/qml/Button.qml
diff --git a/src/qml/DropDownMenuBookmark.qml b/src/desktop/qml/DropDownMenuBookmark.qml
index 06bab66..06bab66 100644
--- a/src/qml/DropDownMenuBookmark.qml
+++ b/src/desktop/qml/DropDownMenuBookmark.qml
diff --git a/src/qml/DropDownMenuBookmarkDelegate.qml b/src/desktop/qml/DropDownMenuBookmarkDelegate.qml
index 89bcf18..89bcf18 100644
--- a/src/qml/DropDownMenuBookmarkDelegate.qml
+++ b/src/desktop/qml/DropDownMenuBookmarkDelegate.qml
diff --git a/src/qml/HoveredLinkBar.qml b/src/desktop/qml/HoveredLinkBar.qml
index 8712c4d..8712c4d 100644
--- a/src/qml/HoveredLinkBar.qml
+++ b/src/desktop/qml/HoveredLinkBar.qml
diff --git a/src/qml/NewTab.qml b/src/desktop/qml/NewTab.qml
index 57ea4f6..57ea4f6 100644
--- a/src/qml/NewTab.qml
+++ b/src/desktop/qml/NewTab.qml
diff --git a/src/qml/PageWidget.qml b/src/desktop/qml/PageWidget.qml
index a873552..a873552 100644
--- a/src/qml/PageWidget.qml
+++ b/src/desktop/qml/PageWidget.qml
diff --git a/src/qml/Tab.qml b/src/desktop/qml/Tab.qml
index 8b3b994..8b3b994 100644
--- a/src/qml/Tab.qml
+++ b/src/desktop/qml/Tab.qml
diff --git a/src/qml/TabWidget.js b/src/desktop/qml/TabWidget.js
index 2770dbf..2770dbf 100644
--- a/src/qml/TabWidget.js
+++ b/src/desktop/qml/TabWidget.js
diff --git a/src/qml/TabWidget.qml b/src/desktop/qml/TabWidget.qml
index df3d723..df3d723 100644
--- a/src/qml/TabWidget.qml
+++ b/src/desktop/qml/TabWidget.qml
diff --git a/src/qml/UrlBar.qml b/src/desktop/qml/UrlBar.qml
index 7391227..7391227 100644
--- a/src/qml/UrlBar.qml
+++ b/src/desktop/qml/UrlBar.qml
diff --git a/src/qml/UrlEdit.qml b/src/desktop/qml/UrlEdit.qml
index d276c36..d276c36 100644
--- a/src/qml/UrlEdit.qml
+++ b/src/desktop/qml/UrlEdit.qml
diff --git a/src/qml/main.qml b/src/desktop/qml/main.qml
index 065048a..065048a 100644
--- a/src/qml/main.qml
+++ b/src/desktop/qml/main.qml
diff --git a/src/snowshoe.qrc b/src/desktop/snowshoe.qrc
index 5209f57..5209f57 100644
--- a/src/snowshoe.qrc
+++ b/src/desktop/snowshoe.qrc
diff --git a/src/main.cpp b/src/main.cpp
index 3e338f0..ee84c73 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,12 +14,12 @@
  *   GNU Lesser General Public License for more details.                    *
  ****************************************************************************/
 
-#include "BrowserWindow.h"
+#include "desktop/BrowserWindow.h"
+#include "mobile/BrowserWindowMobile.h"
 
 #include "BookmarkFilter.h"
 #include "DatabaseManager.h"
 #include "PopupWindow.h"
-#include "Shortcut.h"
 
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QLatin1String>
@@ -44,13 +44,21 @@ int main(int argc, char** argv)
     qmlRegisterType<BookmarkFilter>("Snowshoe", 1, 0, "BookmarkFilter");
     qmlRegisterUncreatableType<QAbstractItemModel>("Snowshoe", 1, 0, "QAbstractItemModel", QObject::tr("You can't create a QAbstractItemModel"));
     qmlRegisterType<PopupWindow>("Snowshoe", 1, 0, "PopupWindow");
-    qmlRegisterType<Shortcut>("Snowshoe", 1, 0, "Shortcut");
 
     DatabaseManager::instance()->initialize();
 
-    QStringList arguments = app.arguments().mid(1);
-    BrowserWindow* window = new BrowserWindow(arguments);
-
+    QStringList arguments = app.arguments();
+    QWindow* window;
+    if (arguments.contains(QLatin1String("--mobile"))) {
+        window = new BrowserWindowMobile();
+    } else {
+        int pos = arguments.indexOf(QLatin1String("--desktop"));
+        if (pos != -1)
+            arguments.removeAt(pos);
+        arguments = arguments.mid(1);
+        window = new BrowserWindow(arguments);
+    }
+    
     window->show();
     app.exec();
     DatabaseManager::instance()->destroy();
diff --git a/src/main.pro b/src/main.pro
new file mode 100644
index 0000000..3072f1a
--- /dev/null
+++ b/src/main.pro
@@ -0,0 +1,43 @@
+TEMPLATE = app
+TARGET = ../snowshoe
+
+QT += declarative sql widgets webkit-private quick core-private gui-private
+
+LIBS += -Lcore/ -lsnowshoe
+
+INCLUDEPATH += core
+
+SOURCES += \
+    desktop/BrowserWindow.cpp \
+    desktop/Shortcut.cpp \
+    mobile/BrowserWindowMobile.cpp \
+    main.cpp
+
+HEADERS += \
+    desktop/BrowserWindow.h \
+    mobile/BrowserWindowMobile.h \
+    desktop/Shortcut.h \
+
+RESOURCES += \
+    desktop/snowshoe.qrc \
+    mobile/snowshoe-mobile.qrc
+
+MOC_DIR = .moc/
+RCC_DIR = .rcc/
+OBJECTS_DIR = .obj/
+
+OTHER_FILES += \
+    desktop/qml/BookmarkBar.qml \
+    desktop/qml/BookmarkBarDelegate.qml \
+    desktop/qml/Button.qml \
+    desktop/qml/DropDownMenuBookmark.qml \
+    desktop/qml/DropDownMenuBookmarkDelegate.qml \
+    desktop/qml/HoveredLinkBar.qml \
+    desktop/qml/NewTab.qml \
+    desktop/qml/PageWidget.qml \
+    desktop/qml/Tab.qml \
+    desktop/qml/TabWidget.js \
+    desktop/qml/TabWidget.qml \
+    desktop/qml/UrlBar.qml \
+    desktop/qml/UrlEdit.qml \
+    desktop/qml/main.qml
diff --git a/src/mobile/BrowserWindowMobile.cpp b/src/mobile/BrowserWindowMobile.cpp
new file mode 100644
index 0000000..8c65396
--- /dev/null
+++ b/src/mobile/BrowserWindowMobile.cpp
@@ -0,0 +1,42 @@
+/****************************************************************************
+ *   Copyright (C) 2011  Andreas Kling <awesomekling@gmail.com>             *
+ *   Copyright (C) 2011  Instituto Nokia de Tecnologia (INdT)               *
+ *                                                                          *
+ *   This file may be used under the terms of the GNU Lesser                *
+ *   General Public License version 2.1 as published by the Free Software   *
+ *   Foundation and appearing in the file LICENSE.LGPL included in the      *
+ *   packaging of this file.  Please review the following information to    *
+ *   ensure the GNU Lesser General Public License version 2.1 requirements  *
+ *   will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.   *
+ *                                                                          *
+ *   This program is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU Lesser General Public License for more details.                    *
+ ****************************************************************************/
+
+#include "BrowserWindowMobile.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQuick/QQuickItem>
+
+BrowserWindowMobile::BrowserWindowMobile()
+    : m_browserView(0)
+{
+    setupDeclarativeEnvironment();
+    m_browserView = qobject_cast<QQuickItem*>(rootObject());
+    Q_ASSERT(m_browserView);
+}
+
+void BrowserWindowMobile::setupDeclarativeEnvironment()
+{
+    QDeclarativeContext* context = rootContext();
+    context->setContextProperty("BrowserWindow", this);
+
+    QObject::connect(engine(), SIGNAL(quit()), qApp, SLOT(quit()));
+
+    setResizeMode(QQuickView::SizeRootObjectToView);
+    setSource(QUrl("qrc:/mobile/qml/main.qml"));
+}
diff --git a/src/mobile/BrowserWindowMobile.h b/src/mobile/BrowserWindowMobile.h
new file mode 100644
index 0000000..87b7cad
--- /dev/null
+++ b/src/mobile/BrowserWindowMobile.h
@@ -0,0 +1,34 @@
+/****************************************************************************
+ *   Copyright (C) 2011  Andreas Kling <awesomekling@gmail.com>             *
+ *   Copyright (C) 2011  Instituto Nokia de Tecnologia (INdT)               *
+ *                                                                          *
+ *   This file may be used under the terms of the GNU Lesser                *
+ *   General Public License version 2.1 as published by the Free Software   *
+ *   Foundation and appearing in the file LICENSE.LGPL included in the      *
+ *   packaging of this file.  Please review the following information to    *
+ *   ensure the GNU Lesser General Public License version 2.1 requirements  *
+ *   will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.   *
+ *                                                                          *
+ *   This program is distributed in the hope that it will be useful,        *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU Lesser General Public License for more details.                    *
+ ****************************************************************************/
+
+#ifndef BrowserWindowMobile_h
+#define BrowserWindowMobile_h
+
+#include <QtQuick/QQuickView>
+
+class BrowserWindowMobile : public QQuickView {
+    Q_OBJECT
+
+public:
+    BrowserWindowMobile();
+
+private:
+    void setupDeclarativeEnvironment();
+    QQuickItem* m_browserView;
+};
+
+#endif
diff --git a/src/mobile/qml/main.qml b/src/mobile/qml/main.qml
new file mode 100644
index 0000000..5f987c5
--- /dev/null
+++ b/src/mobile/qml/main.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 640
+    height: 480
+    Text {
+        anchors.fill : parent
+        text: "Hello Mobile"
+    }
+}
diff --git a/src/mobile/snowshoe-mobile.qrc b/src/mobile/snowshoe-mobile.qrc
new file mode 100644
index 0000000..772647e
--- /dev/null
+++ b/src/mobile/snowshoe-mobile.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/mobile">
+        <file>qml/main.qml</file>
+    </qresource>
+</RCC>
diff --git a/src/src.pro b/src/src.pro
index b4e75bf..e6d9080 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,47 +1,6 @@
-TEMPLATE = app
-TARGET = ../snowshoe
+TEMPLATE = subdirs
+CONFIG += ordered
 
-QT += declarative sql widgets webkit-private quick core-private gui-private
-
-SOURCES += \
-    ApplicationStateTracker.cpp \
-    BookmarkFilter.cpp \
-    BookmarkModel.cpp \
-    BrowserWindow.cpp \
-    DatabaseManager.cpp \
-    PopupWindow.cpp \
-    Shortcut.cpp \
-    main.cpp
-
-HEADERS += \
-    ApplicationStateTracker.h \
-    BookmarkFilter.h \
-    BookmarkModel.h \
-    BrowserWindow.h \
-    DatabaseManager.h \
-    PopupWindow.h \
-    Shortcut.h \
-    UrlTools.h
-
-RESOURCES += \
-    snowshoe.qrc
-
-MOC_DIR = .moc/
-RCC_DIR = .rcc/
-OBJECTS_DIR = .obj/
-
-OTHER_FILES += \
-    qml/BookmarkBar.qml \
-    qml/BookmarkBarDelegate.qml \
-    qml/Button.qml \
-    qml/DropDownMenuBookmark.qml \
-    qml/DropDownMenuBookmarkDelegate.qml \
-    qml/HoveredLinkBar.qml \
-    qml/NewTab.qml \
-    qml/PageWidget.qml \
-    qml/Tab.qml \
-    qml/TabWidget.js \
-    qml/TabWidget.qml \
-    qml/UrlBar.qml \
-    qml/UrlEdit.qml \
-    qml/main.qml
+SUBDIRS = \
+    core \
+    main.pro