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/button/button.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/button/button.pro') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/button/button.pro | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro index b10b619..e1c6724 100644 --- a/core/settings/button/button.pro +++ b/core/settings/button/button.pro | |||
@@ -1,7 +1,6 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | 2 | |
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = buttonsettings.h \ | 3 | HEADERS = buttonsettings.h \ |
5 | buttonutils.h \ | 4 | buttonutils.h \ |
6 | remapdlg.h | 5 | remapdlg.h |
7 | 6 | ||
@@ -14,9 +13,9 @@ INTERFACES = remapdlgbase.ui | |||
14 | 13 | ||
15 | INCLUDEPATH += $(OPIEDIR)/include | 14 | INCLUDEPATH += $(OPIEDIR)/include |
16 | DEPENDPATH += $(OPIEDIR)/include | 15 | DEPENDPATH += $(OPIEDIR)/include |
17 | LIBS += -lqpe -lopie | 16 | LIBS += -lqpe -lopie |
18 | TARGET = buttonsettings | 17 | TARGET = buttonsettings |
19 | 18 | ||
20 | TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ | 19 | TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ |
21 | ../../../i18n/nl/buttonsettings.ts \ | 20 | ../../../i18n/nl/buttonsettings.ts \ |
22 | ../../../i18n/xx/buttonsettings.ts \ | 21 | ../../../i18n/xx/buttonsettings.ts \ |
@@ -34,7 +33,5 @@ TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ | |||
34 | ../../../i18n/zh_CN/buttonsettings.ts \ | 33 | ../../../i18n/zh_CN/buttonsettings.ts \ |
35 | ../../../i18n/zh_TW/buttonsettings.ts \ | 34 | ../../../i18n/zh_TW/buttonsettings.ts \ |
36 | ../../../i18n/da/buttonsettings.ts | 35 | ../../../i18n/da/buttonsettings.ts |
37 | 36 | ||
38 | |||
39 | |||
40 | include ( $(OPIEDIR)/include.pro ) | 37 | include ( $(OPIEDIR)/include.pro ) |