6 files changed, 6 insertions, 407 deletions
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index d9566c9..d7f2a5d 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -7,78 +7,13 @@ HEADERS      = buttonsettings.h \
 SOURCES      = main.cpp \
               buttonsettings.cpp \
               buttonutils.cpp \
               remapdlg.cpp
 INTERFACES   = remapdlgbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
        TARGET     = buttonsettings
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index 7f4e823..26b76eb 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,79 +1,10 @@
 CONFIG += qt warn_on  quick-app
 HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
 SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        TARGET= citytime
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro
index 17da998..24ae675 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -16,84 +16,13 @@ SOURCES      = main.cpp \
               inputmethodsettings.cpp \
               doctabsettings.cpp \
               tabdialog.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 TARGET       = launchersettings
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 81bd1f5..e1f3cb1 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,74 +1,11 @@
        CONFIG  += qt warn_on  quick-app
        HEADERS         = light.h sensor.h calibration.h
        SOURCES         = light.cpp main.cpp sensor.cpp calibration.cpp
        INTERFACES= lightsettingsbase.ui sensorbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= 
 LIBS            += -lqpe -lopiecore2
        TARGET  = light-and-power
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/security/demo/multiauth.pro b/core/settings/security/demo/multiauth.pro
index 8e71f66..ecf5803 100644
--- a/core/settings/security/demo/multiauth.pro
+++ b/core/settings/security/demo/multiauth.pro
@@ -3,81 +3,15 @@ CONFIG += qt warn_on
 HEADERS         =
 SOURCES         = main.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      +=
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
 DESTDIR = $(OPIEDIR)/bin
 TARGET = multiauth
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 2526c45..7fb0f5e 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,77 +1,10 @@
 CONFIG += qt warn_on quick-app
 HEADERS         = multiauthconfig.h
 SOURCES         = multiauthconfig.cpp main.cpp
        INTERFACES= loginbase.ui syncbase.ui
 INCLUDEPATH     += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
 TARGET = security
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )

diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro index d9566c9..d7f2a5d 100644 --- a/core/settings/button/button.pro +++ b/core/settings/button/button.pro
@@ -7,78 +7,13 @@ HEADERS = buttonsettings.h \
7	SOURCES = main.cpp \	7	SOURCES = main.cpp \
8	buttonsettings.cpp \	8	buttonsettings.cpp \
9	buttonutils.cpp \	9	buttonutils.cpp \
10	remapdlg.cpp	10	remapdlg.cpp
11		11
12	INTERFACES = remapdlgbase.ui	12	INTERFACES = remapdlgbase.ui
13		13
14	INCLUDEPATH += $(OPIEDIR)/include	14	INCLUDEPATH += $(OPIEDIR)/include
15	DEPENDPATH += $(OPIEDIR)/include	15	DEPENDPATH += $(OPIEDIR)/include
16	LIBS += -lqpe -lopiecore2	16	LIBS += -lqpe -lopiecore2
17	TARGET = buttonsettings	17	TARGET = buttonsettings
18		18
19	include(	19	include( $(OPIEDIR)/include.pro )
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84	$(OPIEDIR)/include.pro )


diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index 7f4e823..26b76eb 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro
@@ -1,79 +1,10 @@
1	CONFIG += qt warn_on quick-app	1	CONFIG += qt warn_on quick-app
2	HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h	2	HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
3	SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp	3	SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
4	INCLUDEPATH += $(OPIEDIR)/include	4	INCLUDEPATH += $(OPIEDIR)/include
5	DEPENDPATH += $(OPIEDIR)/include	5	DEPENDPATH += $(OPIEDIR)/include
6	LIBS += -lqpe -lopiecore2	6	LIBS += -lqpe -lopiecore2
7		7
8	TARGET= citytime	8	TARGET= citytime
9		9
10	include(	10	include( $(OPIEDIR)/include.pro )
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79	$(OPIEDIR)/include.pro )


diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index 17da998..24ae675 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro
@@ -16,84 +16,13 @@ SOURCES = main.cpp \
16	inputmethodsettings.cpp \	16	inputmethodsettings.cpp \
17	doctabsettings.cpp \	17	doctabsettings.cpp \
18	tabdialog.cpp	18	tabdialog.cpp
19		19
20	INCLUDEPATH += $(OPIEDIR)/include	20	INCLUDEPATH += $(OPIEDIR)/include
21	DEPENDPATH += $(OPIEDIR)/include	21	DEPENDPATH += $(OPIEDIR)/include
22	LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2	22	LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2
23	TARGET = launchersettings	23	TARGET = launchersettings
24		24
25		25
26		26
27		27
28	include(	28	include( $(OPIEDIR)/include.pro )
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99	$(OPIEDIR)/include.pro )


diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 81bd1f5..e1f3cb1 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,74 +1,11 @@
1	CONFIG += qt warn_on quick-app	1	CONFIG += qt warn_on quick-app
2	HEADERS = light.h sensor.h calibration.h	2	HEADERS = light.h sensor.h calibration.h
3	SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp	3	SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp
4	INTERFACES= lightsettingsbase.ui sensorbase.ui	4	INTERFACES= lightsettingsbase.ui sensorbase.ui
5	INCLUDEPATH += $(OPIEDIR)/include	5	INCLUDEPATH += $(OPIEDIR)/include
6	DEPENDPATH+=	6	DEPENDPATH+=
7	LIBS += -lqpe -lopiecore2	7	LIBS += -lqpe -lopiecore2
8		8
9	TARGET = light-and-power	9	TARGET = light-and-power
10		10
11	include(	11	include( $(OPIEDIR)/include.pro )
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74	$(OPIEDIR)/include.pro )


diff --git a/core/settings/security/demo/multiauth.pro b/core/settings/security/demo/multiauth.pro index 8e71f66..ecf5803 100644 --- a/core/settings/security/demo/multiauth.pro +++ b/core/settings/security/demo/multiauth.pro
@@ -3,81 +3,15 @@ CONFIG += qt warn_on
3		3
4	HEADERS =	4	HEADERS =
5	SOURCES = main.cpp	5	SOURCES = main.cpp
6		6
7	INCLUDEPATH += $(OPIEDIR)/include	7	INCLUDEPATH += $(OPIEDIR)/include
8	DEPENDPATH +=	8	DEPENDPATH +=
9		9
10	LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2	10	LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
11		11
12	DESTDIR = $(OPIEDIR)/bin	12	DESTDIR = $(OPIEDIR)/bin
13	TARGET = multiauth	13	TARGET = multiauth
14		14
15	include(	15	include( $(OPIEDIR)/include.pro )
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81	$(OPIEDIR)/include.pro )
82		16
83		17


diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index 2526c45..7fb0f5e 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.pro
@@ -1,77 +1,10 @@
1	CONFIG += qt warn_on quick-app	1	CONFIG += qt warn_on quick-app
2	HEADERS = multiauthconfig.h	2	HEADERS = multiauthconfig.h
3	SOURCES = multiauthconfig.cpp main.cpp	3	SOURCES = multiauthconfig.cpp main.cpp
4	INTERFACES= loginbase.ui syncbase.ui	4	INTERFACES= loginbase.ui syncbase.ui
5		5
6	INCLUDEPATH += $(OPIEDIR)/include	6	INCLUDEPATH += $(OPIEDIR)/include
7	LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2	7	LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
8	TARGET = security	8	TARGET = security
9		9
10	include(	10	include( $(OPIEDIR)/include.pro )
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77	$(OPIEDIR)/include.pro )