summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <rgriebl@trolltech.com>2010-04-19 14:12:15 +0200
committerRobert Griebl <rgriebl@trolltech.com>2010-04-19 14:12:15 +0200
commit144e7412ea865170990695f9f83896b5d6502730 (patch)
tree729bf10e53a93b193d725792379e45094f762691
parent9f0f67985982b08660c44ee921fdf5d05f46d712 (diff)
reorg: split the kinetics scroller and the test app
-rw-r--r--kineticscroller.pro32
-rw-r--r--scroller/qkineticscroller.cpp (renamed from qkineticscroller.cpp)0
-rw-r--r--scroller/qkineticscroller.h (renamed from qkineticscroller.h)0
-rw-r--r--scroller/qkineticscroller_p.h (renamed from qkineticscroller_p.h)0
-rw-r--r--scroller/scroller.pro12
-rw-r--r--testapp/main.cpp (renamed from main.cpp)0
-rw-r--r--testapp/plotwidget.cpp (renamed from plotwidget.cpp)0
-rw-r--r--testapp/plotwidget.h (renamed from plotwidget.h)0
-rw-r--r--testapp/qscrollareakineticscroller.cpp (renamed from qscrollareakineticscroller.cpp)0
-rw-r--r--testapp/qscrollareakineticscroller.h (renamed from qscrollareakineticscroller.h)0
-rw-r--r--testapp/settingswidget.cpp (renamed from settingswidget.cpp)0
-rw-r--r--testapp/settingswidget.h (renamed from settingswidget.h)0
-rw-r--r--testapp/testapp.pro16
13 files changed, 30 insertions, 30 deletions
diff --git a/kineticscroller.pro b/kineticscroller.pro
index 061318a..0d4e45f 100644
--- a/kineticscroller.pro
+++ b/kineticscroller.pro
@@ -1,30 +1,2 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Mar 31 20:01:48 2010
-######################################################################
-
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += \
- qkineticscroller.h \
- qkineticscroller_p.h \
- qscrollareakineticscroller.h
-
-SOURCES += \
- qkineticscroller.cpp \
- qscrollareakineticscroller.cpp
-
-# debug/development stuff
-
-HEADERS += \
- settingswidget.h \
- plotwidget.h
-
-SOURCES += \
- settingswidget.cpp \
- plotwidget.cpp \
- main.cpp
-
+TEMPLATE = subdirs
+SUBDIRS = scroller testapp
diff --git a/qkineticscroller.cpp b/scroller/qkineticscroller.cpp
index b9c31a8..b9c31a8 100644
--- a/qkineticscroller.cpp
+++ b/scroller/qkineticscroller.cpp
diff --git a/qkineticscroller.h b/scroller/qkineticscroller.h
index e0378d4..e0378d4 100644
--- a/qkineticscroller.h
+++ b/scroller/qkineticscroller.h
diff --git a/qkineticscroller_p.h b/scroller/qkineticscroller_p.h
index 599bb68..599bb68 100644
--- a/qkineticscroller_p.h
+++ b/scroller/qkineticscroller_p.h
diff --git a/scroller/scroller.pro b/scroller/scroller.pro
new file mode 100644
index 0000000..b2f738d
--- /dev/null
+++ b/scroller/scroller.pro
@@ -0,0 +1,12 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Mon Apr 19 14:02:12 2010
+######################################################################
+
+TEMPLATE = lib
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += qkineticscroller.h qkineticscroller_p.h
+SOURCES += qkineticscroller.cpp
diff --git a/main.cpp b/testapp/main.cpp
index 698ec64..698ec64 100644
--- a/main.cpp
+++ b/testapp/main.cpp
diff --git a/plotwidget.cpp b/testapp/plotwidget.cpp
index 0564df2..0564df2 100644
--- a/plotwidget.cpp
+++ b/testapp/plotwidget.cpp
diff --git a/plotwidget.h b/testapp/plotwidget.h
index 80e76ad..80e76ad 100644
--- a/plotwidget.h
+++ b/testapp/plotwidget.h
diff --git a/qscrollareakineticscroller.cpp b/testapp/qscrollareakineticscroller.cpp
index ecef0c6..ecef0c6 100644
--- a/qscrollareakineticscroller.cpp
+++ b/testapp/qscrollareakineticscroller.cpp
diff --git a/qscrollareakineticscroller.h b/testapp/qscrollareakineticscroller.h
index 77b0caf..77b0caf 100644
--- a/qscrollareakineticscroller.h
+++ b/testapp/qscrollareakineticscroller.h
diff --git a/settingswidget.cpp b/testapp/settingswidget.cpp
index 7f41a7b..7f41a7b 100644
--- a/settingswidget.cpp
+++ b/testapp/settingswidget.cpp
diff --git a/settingswidget.h b/testapp/settingswidget.h
index 22ec6aa..22ec6aa 100644
--- a/settingswidget.h
+++ b/testapp/settingswidget.h
diff --git a/testapp/testapp.pro b/testapp/testapp.pro
new file mode 100644
index 0000000..03da8ec
--- /dev/null
+++ b/testapp/testapp.pro
@@ -0,0 +1,16 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Mon Apr 19 14:02:09 2010
+######################################################################
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += . ../scroller
+INCLUDEPATH += . ../scroller
+LIBS += -L../scroller -lscroller
+
+# Input
+HEADERS += plotwidget.h qscrollareakineticscroller.h settingswidget.h
+SOURCES += main.cpp \
+ plotwidget.cpp \
+ qscrollareakineticscroller.cpp \
+ settingswidget.cpp