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 :(

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,15 +1,14 @@
-        TEMPLATE= app
-        CONFIG  += qt warn_on debug
-        DESTDIR         = $(OPIEDIR)/bin
+        CONFIG  += qt warn_on release 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+= ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopie
+
         TARGET  = light-and-power
 
 TRANSLATIONS = ../../../i18n/de/light-and-power.ts \
          ../../../i18n/nl/light-and-power.ts \
          ../../../i18n/xx/light-and-power.ts \
          ../../../i18n/en/light-and-power.ts \