summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Oliveira <igor.oliveira@openbossa.org>2011-07-25 10:02:08 -0400
committerIgor Oliveira <igor.oliveira@openbossa.org>2011-08-03 15:47:19 -0400
commit147ad15d4f3d71df90195fbcc80e401dee05b046 (patch)
tree65efd02011fcc164c83403413f674c0a4f6f024f
parentb4505dbe6ee11f598c88718b005be1aca37fa729 (diff)
downloadsnowshoe-147ad15d4f3d71df90195fbcc80e401dee05b046.tar.gz
Move files to src directory. That will facilitate the tests creation
Reviewed-by: Caio Marcelo
-rw-r--r--snowshoe.pro74
-rw-r--r--src/BookmarkModel.cpp (renamed from BookmarkModel.cpp)0
-rw-r--r--src/BookmarkModel.h (renamed from BookmarkModel.h)0
-rw-r--r--src/BrowserObject.cpp (renamed from BrowserObject.cpp)0
-rw-r--r--src/BrowserObject.h (renamed from BrowserObject.h)0
-rw-r--r--src/BrowserWindow.cpp (renamed from BrowserWindow.cpp)0
-rw-r--r--src/BrowserWindow.h (renamed from BrowserWindow.h)0
-rw-r--r--src/DatabaseManager.cpp (renamed from DatabaseManager.cpp)0
-rw-r--r--src/DatabaseManager.h (renamed from DatabaseManager.h)0
-rw-r--r--src/MainView.cpp (renamed from MainView.cpp)0
-rw-r--r--src/MainView.h (renamed from MainView.h)0
-rw-r--r--src/TripleClickMonitor.cpp (renamed from TripleClickMonitor.cpp)0
-rw-r--r--src/TripleClickMonitor.h (renamed from TripleClickMonitor.h)0
-rw-r--r--src/images/tabwidget/spinner.gif (renamed from images/tabwidget/spinner.gif)bin808 -> 808 bytes
-rw-r--r--src/images/tabwidget/tab_active_btn_close.png (renamed from images/tabwidget/tab_active_btn_close.png)bin507 -> 507 bytes
-rw-r--r--src/images/tabwidget/tab_active_fill.png (renamed from images/tabwidget/tab_active_fill.png)bin240 -> 240 bytes
-rw-r--r--src/images/tabwidget/tab_active_left.png (renamed from images/tabwidget/tab_active_left.png)bin516 -> 516 bytes
-rw-r--r--src/images/tabwidget/tab_active_right.png (renamed from images/tabwidget/tab_active_right.png)bin775 -> 775 bytes
-rw-r--r--src/images/tabwidget/tab_active_with_inactive_left.png (renamed from images/tabwidget/tab_active_with_inactive_left.png)bin728 -> 728 bytes
-rw-r--r--src/images/tabwidget/tab_active_with_inactive_right.png (renamed from images/tabwidget/tab_active_with_inactive_right.png)bin893 -> 893 bytes
-rw-r--r--src/images/tabwidget/tab_base_fill.png (renamed from images/tabwidget/tab_base_fill.png)bin281 -> 281 bytes
-rw-r--r--src/images/tabwidget/tab_inactive_btn_close.png (renamed from images/tabwidget/tab_inactive_btn_close.png)bin464 -> 464 bytes
-rw-r--r--src/images/tabwidget/tab_inactive_fill.png (renamed from images/tabwidget/tab_inactive_fill.png)bin241 -> 241 bytes
-rw-r--r--src/images/tabwidget/tab_inactive_left.png (renamed from images/tabwidget/tab_inactive_left.png)bin329 -> 329 bytes
-rw-r--r--src/images/tabwidget/tab_inactive_right.png (renamed from images/tabwidget/tab_inactive_right.png)bin532 -> 532 bytes
-rw-r--r--src/images/tabwidget/tab_inactive_with_inactive.png (renamed from images/tabwidget/tab_inactive_with_inactive.png)bin615 -> 615 bytes
-rw-r--r--src/images/urlbar/component_btn_nav_back.png (renamed from images/urlbar/component_btn_nav_back.png)bin615 -> 615 bytes
-rw-r--r--src/images/urlbar/component_btn_nav_next.png (renamed from images/urlbar/component_btn_nav_next.png)bin648 -> 648 bytes
-rw-r--r--src/images/urlbar/component_btn_nav_refresh.png (renamed from images/urlbar/component_btn_nav_refresh.png)bin1068 -> 1068 bytes
-rw-r--r--src/images/urlbar/component_divisor.png (renamed from images/urlbar/component_divisor.png)bin207 -> 207 bytes
-rw-r--r--src/images/urlbar/component_url_input.png (renamed from images/urlbar/component_url_input.png)bin360 -> 360 bytes
-rw-r--r--src/images/urlbar/progress_bar_url.png (renamed from images/urlbar/progress_bar_url.png)bin497 -> 497 bytes
-rw-r--r--src/images/urlbar/url_bg_base_fill.png (renamed from images/urlbar/url_bg_base_fill.png)bin210 -> 210 bytes
-rw-r--r--src/main.cpp (renamed from main.cpp)0
-rw-r--r--src/qml/PageWidget.qml (renamed from qml/PageWidget.qml)0
-rw-r--r--src/qml/Tab.qml (renamed from qml/Tab.qml)0
-rw-r--r--src/qml/TabWidget.js (renamed from qml/TabWidget.js)0
-rw-r--r--src/qml/TabWidget.qml (renamed from qml/TabWidget.qml)0
-rw-r--r--src/qml/UrlBar.qml (renamed from qml/UrlBar.qml)0
-rw-r--r--src/qml/UrlEdit.qml (renamed from qml/UrlEdit.qml)0
-rw-r--r--src/qml/main.qml (renamed from qml/main.qml)0
-rw-r--r--src/snowshoe.qrc (renamed from snowshoe.qrc)0
-rw-r--r--src/src.pro71
43 files changed, 75 insertions, 70 deletions
diff --git a/snowshoe.pro b/snowshoe.pro
index 48aff3f..427e4c4 100644
--- a/snowshoe.pro
+++ b/snowshoe.pro
@@ -1,71 +1,5 @@
-TEMPLATE = app
-TARGET = snowshoe
+TEMPLATE = subdirs
+CONFIG += ordered
-QT += declarative sql
-
-SOURCES += \
- main.cpp \
- BookmarkModel.cpp \
- BrowserObject.cpp \
- BrowserWindow.cpp \
- DatabaseManager.cpp \
- MainView.cpp \
- TripleClickMonitor.cpp
-
-HEADERS += \
- BookmarkModel.h \
- BrowserObject.h \
- BrowserWindow.h \
- DatabaseManager.h \
- MainView.h \
- TripleClickMonitor.h
-
-RESOURCES += \
- snowshoe.qrc
-
-MOC_DIR = .moc/
-RCC_DIR = .rcc/
-OBJECTS_DIR = .obj/
-
-WEBKIT_SOURCE_DIR = $$(WEBKIT_SOURCE_DIR)
-isEmpty(WEBKIT_SOURCE_DIR) {
- error(Please set WEBKIT_SOURCE_DIR environment variable)
-} else {
- message(Using WebKit source from $$WEBKIT_SOURCE_DIR)
-}
-
-WEBKIT_BUILD_DIR = $$(WEBKIT_BUILD_DIR)
-isEmpty(WEBKIT_BUILD_DIR) {
- WEBKIT_BUILD_DIR = $$WEBKIT_SOURCE_DIR/WebKitBuild/Release
-}
-
-message(Using WebKit build from $$WEBKIT_BUILD_DIR)
-
-INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/
-INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit2/UIProcess/API/qt
-INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit2/UIProcess/API/C
-INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit2/UIProcess/API/cpp
-INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit/qt/Api
-
-INCLUDEPATH += $$WEBKIT_BUILD_DIR/include/
-INCLUDEPATH += $$WEBKIT_BUILD_DIR/include/WebKit2
-
-# WebKit needs to be the first, just in case the Qt build contains already a QtWebKit.
-QMAKE_LFLAGS = -L$$WEBKIT_BUILD_DIR/lib $$QMAKE_LFLAGS
-
-macx {
- LIBS += -framework QtWebKit
-} else {
- # Make sure that again the custom WebKit is the first in the rpath otherwise it will not pick the right one.
- unix : QMAKE_RPATHDIR = $$WEBKIT_BUILD_DIR/lib $$QMAKE_RPATHDIR
- LIBS += -lQtWebKit
-}
-
-OTHER_FILES += \
- qml/main.qml \
- qml/Tab.qml \
- qml/TabWidget.qml \
- qml/TabWidget.js \
- qml/UrlEdit.qml \
- qml/UrlBar.qml \
- qml/PageWidget.qml
+SUBDIRS = \
+ src/
diff --git a/BookmarkModel.cpp b/src/BookmarkModel.cpp
index ff9e32d..ff9e32d 100644
--- a/BookmarkModel.cpp
+++ b/src/BookmarkModel.cpp
diff --git a/BookmarkModel.h b/src/BookmarkModel.h
index f59bbcb..f59bbcb 100644
--- a/BookmarkModel.h
+++ b/src/BookmarkModel.h
diff --git a/BrowserObject.cpp b/src/BrowserObject.cpp
index d5271ac..d5271ac 100644
--- a/BrowserObject.cpp
+++ b/src/BrowserObject.cpp
diff --git a/BrowserObject.h b/src/BrowserObject.h
index 329bdb6..329bdb6 100644
--- a/BrowserObject.h
+++ b/src/BrowserObject.h
diff --git a/BrowserWindow.cpp b/src/BrowserWindow.cpp
index 8150049..8150049 100644
--- a/BrowserWindow.cpp
+++ b/src/BrowserWindow.cpp
diff --git a/BrowserWindow.h b/src/BrowserWindow.h
index 930d934..930d934 100644
--- a/BrowserWindow.h
+++ b/src/BrowserWindow.h
diff --git a/DatabaseManager.cpp b/src/DatabaseManager.cpp
index 0362eaf..0362eaf 100644
--- a/DatabaseManager.cpp
+++ b/src/DatabaseManager.cpp
diff --git a/DatabaseManager.h b/src/DatabaseManager.h
index 6eef142..6eef142 100644
--- a/DatabaseManager.h
+++ b/src/DatabaseManager.h
diff --git a/MainView.cpp b/src/MainView.cpp
index b87a0c0..b87a0c0 100644
--- a/MainView.cpp
+++ b/src/MainView.cpp
diff --git a/MainView.h b/src/MainView.h
index 7e9364f..7e9364f 100644
--- a/MainView.h
+++ b/src/MainView.h
diff --git a/TripleClickMonitor.cpp b/src/TripleClickMonitor.cpp
index 1a491c7..1a491c7 100644
--- a/TripleClickMonitor.cpp
+++ b/src/TripleClickMonitor.cpp
diff --git a/TripleClickMonitor.h b/src/TripleClickMonitor.h
index 38596c0..38596c0 100644
--- a/TripleClickMonitor.h
+++ b/src/TripleClickMonitor.h
diff --git a/images/tabwidget/spinner.gif b/src/images/tabwidget/spinner.gif
index 934a5df..934a5df 100644
--- a/images/tabwidget/spinner.gif
+++ b/src/images/tabwidget/spinner.gif
Binary files differ
diff --git a/images/tabwidget/tab_active_btn_close.png b/src/images/tabwidget/tab_active_btn_close.png
index 1b59f55..1b59f55 100644
--- a/images/tabwidget/tab_active_btn_close.png
+++ b/src/images/tabwidget/tab_active_btn_close.png
Binary files differ
diff --git a/images/tabwidget/tab_active_fill.png b/src/images/tabwidget/tab_active_fill.png
index 2921a28..2921a28 100644
--- a/images/tabwidget/tab_active_fill.png
+++ b/src/images/tabwidget/tab_active_fill.png
Binary files differ
diff --git a/images/tabwidget/tab_active_left.png b/src/images/tabwidget/tab_active_left.png
index f9aaa77..f9aaa77 100644
--- a/images/tabwidget/tab_active_left.png
+++ b/src/images/tabwidget/tab_active_left.png
Binary files differ
diff --git a/images/tabwidget/tab_active_right.png b/src/images/tabwidget/tab_active_right.png
index a0d3339..a0d3339 100644
--- a/images/tabwidget/tab_active_right.png
+++ b/src/images/tabwidget/tab_active_right.png
Binary files differ
diff --git a/images/tabwidget/tab_active_with_inactive_left.png b/src/images/tabwidget/tab_active_with_inactive_left.png
index 834d0eb..834d0eb 100644
--- a/images/tabwidget/tab_active_with_inactive_left.png
+++ b/src/images/tabwidget/tab_active_with_inactive_left.png
Binary files differ
diff --git a/images/tabwidget/tab_active_with_inactive_right.png b/src/images/tabwidget/tab_active_with_inactive_right.png
index 8ace092..8ace092 100644
--- a/images/tabwidget/tab_active_with_inactive_right.png
+++ b/src/images/tabwidget/tab_active_with_inactive_right.png
Binary files differ
diff --git a/images/tabwidget/tab_base_fill.png b/src/images/tabwidget/tab_base_fill.png
index 57f1bfa..57f1bfa 100644
--- a/images/tabwidget/tab_base_fill.png
+++ b/src/images/tabwidget/tab_base_fill.png
Binary files differ
diff --git a/images/tabwidget/tab_inactive_btn_close.png b/src/images/tabwidget/tab_inactive_btn_close.png
index 7533795..7533795 100644
--- a/images/tabwidget/tab_inactive_btn_close.png
+++ b/src/images/tabwidget/tab_inactive_btn_close.png
Binary files differ
diff --git a/images/tabwidget/tab_inactive_fill.png b/src/images/tabwidget/tab_inactive_fill.png
index a709bd8..a709bd8 100644
--- a/images/tabwidget/tab_inactive_fill.png
+++ b/src/images/tabwidget/tab_inactive_fill.png
Binary files differ
diff --git a/images/tabwidget/tab_inactive_left.png b/src/images/tabwidget/tab_inactive_left.png
index a3fcfbe..a3fcfbe 100644
--- a/images/tabwidget/tab_inactive_left.png
+++ b/src/images/tabwidget/tab_inactive_left.png
Binary files differ
diff --git a/images/tabwidget/tab_inactive_right.png b/src/images/tabwidget/tab_inactive_right.png
index 6255835..6255835 100644
--- a/images/tabwidget/tab_inactive_right.png
+++ b/src/images/tabwidget/tab_inactive_right.png
Binary files differ
diff --git a/images/tabwidget/tab_inactive_with_inactive.png b/src/images/tabwidget/tab_inactive_with_inactive.png
index c690818..c690818 100644
--- a/images/tabwidget/tab_inactive_with_inactive.png
+++ b/src/images/tabwidget/tab_inactive_with_inactive.png
Binary files differ
diff --git a/images/urlbar/component_btn_nav_back.png b/src/images/urlbar/component_btn_nav_back.png
index 4eb7768..4eb7768 100644
--- a/images/urlbar/component_btn_nav_back.png
+++ b/src/images/urlbar/component_btn_nav_back.png
Binary files differ
diff --git a/images/urlbar/component_btn_nav_next.png b/src/images/urlbar/component_btn_nav_next.png
index a35c959..a35c959 100644
--- a/images/urlbar/component_btn_nav_next.png
+++ b/src/images/urlbar/component_btn_nav_next.png
Binary files differ
diff --git a/images/urlbar/component_btn_nav_refresh.png b/src/images/urlbar/component_btn_nav_refresh.png
index 77fd7fc..77fd7fc 100644
--- a/images/urlbar/component_btn_nav_refresh.png
+++ b/src/images/urlbar/component_btn_nav_refresh.png
Binary files differ
diff --git a/images/urlbar/component_divisor.png b/src/images/urlbar/component_divisor.png
index d6fdf56..d6fdf56 100644
--- a/images/urlbar/component_divisor.png
+++ b/src/images/urlbar/component_divisor.png
Binary files differ
diff --git a/images/urlbar/component_url_input.png b/src/images/urlbar/component_url_input.png
index 12053c7..12053c7 100644
--- a/images/urlbar/component_url_input.png
+++ b/src/images/urlbar/component_url_input.png
Binary files differ
diff --git a/images/urlbar/progress_bar_url.png b/src/images/urlbar/progress_bar_url.png
index 7e2f7e5..7e2f7e5 100644
--- a/images/urlbar/progress_bar_url.png
+++ b/src/images/urlbar/progress_bar_url.png
Binary files differ
diff --git a/images/urlbar/url_bg_base_fill.png b/src/images/urlbar/url_bg_base_fill.png
index a6d2070..a6d2070 100644
--- a/images/urlbar/url_bg_base_fill.png
+++ b/src/images/urlbar/url_bg_base_fill.png
Binary files differ
diff --git a/main.cpp b/src/main.cpp
index a574500..a574500 100644
--- a/main.cpp
+++ b/src/main.cpp
diff --git a/qml/PageWidget.qml b/src/qml/PageWidget.qml
index 186dbb5..186dbb5 100644
--- a/qml/PageWidget.qml
+++ b/src/qml/PageWidget.qml
diff --git a/qml/Tab.qml b/src/qml/Tab.qml
index 9b30736..9b30736 100644
--- a/qml/Tab.qml
+++ b/src/qml/Tab.qml
diff --git a/qml/TabWidget.js b/src/qml/TabWidget.js
index 6d00569..6d00569 100644
--- a/qml/TabWidget.js
+++ b/src/qml/TabWidget.js
diff --git a/qml/TabWidget.qml b/src/qml/TabWidget.qml
index 917d990..917d990 100644
--- a/qml/TabWidget.qml
+++ b/src/qml/TabWidget.qml
diff --git a/qml/UrlBar.qml b/src/qml/UrlBar.qml
index dc55e34..dc55e34 100644
--- a/qml/UrlBar.qml
+++ b/src/qml/UrlBar.qml
diff --git a/qml/UrlEdit.qml b/src/qml/UrlEdit.qml
index 40c7fea..40c7fea 100644
--- a/qml/UrlEdit.qml
+++ b/src/qml/UrlEdit.qml
diff --git a/qml/main.qml b/src/qml/main.qml
index c146e88..c146e88 100644
--- a/qml/main.qml
+++ b/src/qml/main.qml
diff --git a/snowshoe.qrc b/src/snowshoe.qrc
index 76fdff3..76fdff3 100644
--- a/snowshoe.qrc
+++ b/src/snowshoe.qrc
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000..3af7511
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,71 @@
+TEMPLATE = app
+TARGET = ../snowshoe
+
+QT += declarative sql
+
+SOURCES += \
+ main.cpp \
+ BookmarkModel.cpp \
+ BrowserObject.cpp \
+ BrowserWindow.cpp \
+ DatabaseManager.cpp \
+ MainView.cpp \
+ TripleClickMonitor.cpp
+
+HEADERS += \
+ BookmarkModel.h \
+ BrowserObject.h \
+ BrowserWindow.h \
+ DatabaseManager.h \
+ MainView.h \
+ TripleClickMonitor.h
+
+RESOURCES += \
+ snowshoe.qrc
+
+MOC_DIR = .moc/
+RCC_DIR = .rcc/
+OBJECTS_DIR = .obj/
+
+WEBKIT_SOURCE_DIR = $$(WEBKIT_SOURCE_DIR)
+isEmpty(WEBKIT_SOURCE_DIR) {
+ error(Please set WEBKIT_SOURCE_DIR environment variable)
+} else {
+ message(Using WebKit source from $$WEBKIT_SOURCE_DIR)
+}
+
+WEBKIT_BUILD_DIR = $$(WEBKIT_BUILD_DIR)
+isEmpty(WEBKIT_BUILD_DIR) {
+ WEBKIT_BUILD_DIR = $$WEBKIT_SOURCE_DIR/WebKitBuild/Release
+}
+
+message(Using WebKit build from $$WEBKIT_BUILD_DIR)
+
+INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/
+INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit2/UIProcess/API/qt
+INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit2/UIProcess/API/C
+INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit2/UIProcess/API/cpp
+INCLUDEPATH += $$WEBKIT_SOURCE_DIR/Source/WebKit/qt/Api
+
+INCLUDEPATH += $$WEBKIT_BUILD_DIR/include/
+INCLUDEPATH += $$WEBKIT_BUILD_DIR/include/WebKit2
+
+# WebKit needs to be the first, just in case the Qt build contains already a QtWebKit.
+QMAKE_LFLAGS = -L$$WEBKIT_BUILD_DIR/lib $$QMAKE_LFLAGS
+
+macx {
+ LIBS += -framework QtWebKit
+} else {
+ # Make sure that again the custom WebKit is the first in the rpath otherwise it will not pick the right one.
+ unix : QMAKE_RPATHDIR = $$WEBKIT_BUILD_DIR/lib $$QMAKE_RPATHDIR
+ LIBS += -lQtWebKit
+}
+
+OTHER_FILES += \
+ qml/main.qml \
+ qml/Tab.qml \
+ qml/TabWidget.qml \
+ qml/TabWidget.js \
+ qml/UrlEdit.qml \
+ qml/UrlBar.qml \
+ qml/PageWidget.qml