author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/light-and-power/light-and-power.pro | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
Diffstat (limited to 'core/settings/light-and-power/light-and-power.pro') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/light-and-power/light-and-power.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 9304fa8..4972701 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro | |||
@@ -1,33 +1,32 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on debug | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = light.h sensor.h calibration.h | 2 | HEADERS = light.h sensor.h calibration.h |
5 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp | 3 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp |
6 | INTERFACES= lightsettingsbase.ui sensorbase.ui | 4 | INTERFACES= lightsettingsbase.ui sensorbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= ../$(OPIEDIR)/include | 6 | DEPENDPATH+= ../$(OPIEDIR)/include |
9 | LIBS += -lqpe -lopie | 7 | LIBS += -lqpe -lopie |
8 | |||
10 | TARGET = light-and-power | 9 | TARGET = light-and-power |
11 | 10 | ||
12 | TRANSLATIONS = ../../../i18n/de/light-and-power.ts \ | 11 | TRANSLATIONS = ../../../i18n/de/light-and-power.ts \ |
13 | ../../../i18n/nl/light-and-power.ts \ | 12 | ../../../i18n/nl/light-and-power.ts \ |
14 | ../../../i18n/xx/light-and-power.ts \ | 13 | ../../../i18n/xx/light-and-power.ts \ |
15 | ../../../i18n/en/light-and-power.ts \ | 14 | ../../../i18n/en/light-and-power.ts \ |
16 | ../../../i18n/es/light-and-power.ts \ | 15 | ../../../i18n/es/light-and-power.ts \ |
17 | ../../../i18n/fr/light-and-power.ts \ | 16 | ../../../i18n/fr/light-and-power.ts \ |
18 | ../../../i18n/hu/light-and-power.ts \ | 17 | ../../../i18n/hu/light-and-power.ts \ |
19 | ../../../i18n/ja/light-and-power.ts \ | 18 | ../../../i18n/ja/light-and-power.ts \ |
20 | ../../../i18n/ko/light-and-power.ts \ | 19 | ../../../i18n/ko/light-and-power.ts \ |
21 | ../../../i18n/no/light-and-power.ts \ | 20 | ../../../i18n/no/light-and-power.ts \ |
22 | ../../../i18n/pl/light-and-power.ts \ | 21 | ../../../i18n/pl/light-and-power.ts \ |
23 | ../../../i18n/pt/light-and-power.ts \ | 22 | ../../../i18n/pt/light-and-power.ts \ |
24 | ../../../i18n/pt_BR/light-and-power.ts \ | 23 | ../../../i18n/pt_BR/light-and-power.ts \ |
25 | ../../../i18n/sl/light-and-power.ts \ | 24 | ../../../i18n/sl/light-and-power.ts \ |
26 | ../../../i18n/zh_CN/light-and-power.ts \ | 25 | ../../../i18n/zh_CN/light-and-power.ts \ |
27 | ../../../i18n/zh_TW/light-and-power.ts \ | 26 | ../../../i18n/zh_TW/light-and-power.ts \ |
28 | ../../../i18n/it/light-and-power.ts \ | 27 | ../../../i18n/it/light-and-power.ts \ |
29 | ../../../i18n/da/light-and-power.ts | 28 | ../../../i18n/da/light-and-power.ts |
30 | 29 | ||
31 | 30 | ||
32 | 31 | ||
33 | include ( $(OPIEDIR)/include.pro ) | 32 | include ( $(OPIEDIR)/include.pro ) |