no more unnecessary REQUIRES.

5 files changed, 2 insertions, 6 deletions

diff --git a/library/library.pro b/library/library.pro
index af505dd..fba98f8 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -21,121 +21,121 @@ HEADERS	=   calendar.h \
 	    qpestyle.h \
 	    qpedialog.h \
 	    lightstyle.h \
 	    config.h \
 	    applnk.h \
 	    sound.h \
 	    tzselect.h \
 	    qmath.h \
 	    datebookdb.h \
 	    alarmserver.h \
 	    process.h \
 	    password.h \
 	    timestring.h \
 	    fontfactoryinterface.h \
 	    fontdatabase.h \
 	    power.h \
 	    storage.h \
 	    qpemessagebox.h \
 	    timeconversion.h \
 	    qpedebug.h \
 	    qpemenubar.h \
 	    qpetoolbar.h \
 	    backend/categories.h \
 	    stringutil.h \
 	    backend/palmtoprecord.h \
             backend/task.h \
 	    backend/event.h \
 	    backend/contact.h\
 	    categorymenu.h \
 	    categoryedit_p.h \
 	    categoryselect.h \
 	    categorywidget.h \
 	ir.h \
 	backend/vobject_p.h \
 	findwidget_p.h \
 	finddialog.h \
 	lnkproperties.h \
 	windowdecorationinterface.h \
 	textcodecinterface.h \
 	imagecodecinterface.h
 SOURCES	=   calendar.cpp \
 	    global.cpp \
 	    xmlreader.cpp \
 	    mimetype.cpp \
 	    menubutton.cpp \
 	    network.cpp \
 	    networkinterface.cpp \
 	    filemanager.cpp \
 	    fontmanager.cpp \
 	    qdawg.cpp \
 	    datebookmonth.cpp \
 	    fileselector.cpp \
 	    imageedit.cpp \
 	    resource.cpp \
 	    qpedecoration_qws.cpp \
 	    qcopenvelope_qws.cpp \
 	    qpeapplication.cpp \
 	    qpestyle.cpp \
 	    qpedialog.cpp \
 	    lightstyle.cpp \
 	    config.cpp \
 	    applnk.cpp \
 	    sound.cpp \
 	    tzselect.cpp \
 	    qmath.c \
 	    datebookdb.cpp \
 	    alarmserver.cpp \
 	    password.cpp \
 	    process.cpp \
 	    process_unix.cpp \
 	    timestring.cpp \
 	    fontdatabase.cpp \
 	    power.cpp \
 	    storage.cpp \
 	    qpemessagebox.cpp \
             backend/timeconversion.cpp \
 	    qpedebug.cpp \
 	    qpemenubar.cpp \
 	    qpetoolbar.cpp \
 	    backend/categories.cpp \
 	    backend/stringutil.cpp \
 	    backend/palmtoprecord.cpp \
             backend/task.cpp \
 	    backend/event.cpp \
 	    backend/contact.cpp \
 	    categorymenu.cpp \
 	categoryedit_p.cpp \
 	categoryselect.cpp \
 	categorywidget.cpp \
 	ir.cpp \
 	backend/vcc_yacc.cpp \
 	backend/vobject.cpp \
 	findwidget_p.cpp \
 	finddialog.cpp \
 	lnkproperties.cpp
 # Qt 3 compatibility
-qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
-qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
+HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
+SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
 LIBS		+= -ldl -lcrypt -lm
 INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
 TARGET		= qpe
 DESTDIR		= $(QTDIR)/lib$(PROJMAK)
 # This is set by configure$(OPIEDIR).
 VERSION		= 1.5.0.1
 
 TRANSLATIONS = ../i18n/de/libqpe.ts \
 	 ../i18n/en/libqpe.ts \
 	 ../i18n/es/libqpe.ts \
 	 ../i18n/fr/libqpe.ts \
 	 ../i18n/hu/libqpe.ts \
 	 ../i18n/ja/libqpe.ts \
 	 ../i18n/ko/libqpe.ts \
 	 ../i18n/no/libqpe.ts \
 	 ../i18n/pl/libqpe.ts \
 	 ../i18n/pt/libqpe.ts \
 	 ../i18n/pt_BR/libqpe.ts \
 	 ../i18n/sl/libqpe.ts \
 	 ../i18n/zh_CN/libqpe.ts \
 	 ../i18n/it/libqpe.ts \
 	 ../i18n/zh_TW/libqpe.ts
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 3896f50..bda2fdf 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -1,25 +1,24 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = advancedfm.h inputDialog.h filePermissions.h output.h
 SOURCES   = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp inputDialog.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
-REQUIRES=medium-config
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
 LIBS            += -lqpe -lopie
 
 TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
    ../../../i18n/en/advancedfm.ts \
    ../../../i18n/es/advancedfm.ts \
    ../../../i18n/fr/advancedfm.ts \
    ../../../i18n/hu/advancedfm.ts \
    ../../../i18n/ja/advancedfm.ts \
    ../../../i18n/ko/advancedfm.ts \
    ../../../i18n/no/advancedfm.ts \
    ../../../i18n/pl/advancedfm.ts \
    ../../../i18n/pt/advancedfm.ts \
    ../../../i18n/pt_BR/advancedfm.ts \
    ../../../i18n/sl/advancedfm.ts \
    ../../../i18n/zh_CN/advancedfm.ts \
    ../../../i18n/zh_TW/advancedfm.ts
diff --git a/noncore/games/tictac/tictac.pro b/noncore/games/tictac/tictac.pro
index 0807e83..ada5161 100644
--- a/noncore/games/tictac/tictac.pro
+++ b/noncore/games/tictac/tictac.pro
@@ -1,26 +1,25 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = tictac.h
 SOURCES   = main.cpp \
       tictac.cpp
 TARGET    = tictac
-REQUIRES=medium-config
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 DESTDIR   = $(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/tictac.ts \
 	 ../../../i18n/en/tictac.ts \
 	 ../../../i18n/es/tictac.ts \
 	 ../../../i18n/fr/tictac.ts \
 	 ../../../i18n/hu/tictac.ts \
 	 ../../../i18n/ja/tictac.ts \
 	 ../../../i18n/ko/tictac.ts \
 	 ../../../i18n/no/tictac.ts \
 	 ../../../i18n/pl/tictac.ts \
 	 ../../../i18n/pt/tictac.ts \
 	 ../../../i18n/pt_BR/tictac.ts \
 	 ../../../i18n/sl/tictac.ts \
 	 ../../../i18n/zh_CN/tictac.ts \
 	 ../../../i18n/zh_TW/tictac.ts
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index a56aed1..6d88530 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -1,25 +1,24 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = opieftp.h inputDialog.h ftplib.h
 SOURCES   = opieftp.cpp inputDialog.cpp ftplib.c main.cpp
 TARGET    = opieftp
-REQUIRES=medium-config
 DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../../../i18n/de/opieftp.ts \
 	 ../../../i18n/en/opieftp.ts \
 	 ../../../i18n/es/opieftp.ts \
 	 ../../../i18n/fr/opieftp.ts \
 	 ../../../i18n/hu/opieftp.ts \
 	 ../../../i18n/ja/opieftp.ts \
 	 ../../../i18n/ko/opieftp.ts \
 	 ../../../i18n/no/opieftp.ts \
 	 ../../../i18n/pl/opieftp.ts \
 	 ../../../i18n/pt/opieftp.ts \
 	 ../../../i18n/pt_BR/opieftp.ts \
 	 ../../../i18n/sl/opieftp.ts \
 	 ../../../i18n/zh_CN/opieftp.ts \
 	 ../../../i18n/zh_TW/opieftp.ts
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro
index c4f8298..17801dc 100644
--- a/noncore/tools/formatter/formatter.pro
+++ b/noncore/tools/formatter/formatter.pro
@@ -1,25 +1,24 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = formatter.h inputDialog.h output.h
 SOURCES   = formatter.cpp inputDialog.cpp output.cpp main.cpp
 TARGET    = formatter
-REQUIRES = medium-config
 DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../../../i18n/de/formatter.ts \
 	 ../../../i18n/en/formatter.ts \
 	 ../../../i18n/es/formatter.ts \
 	 ../../../i18n/fr/formatter.ts \
 	 ../../../i18n/hu/formatter.ts \
 	 ../../../i18n/ja/formatter.ts \
 	 ../../../i18n/ko/formatter.ts \
 	 ../../../i18n/no/formatter.ts \
 	 ../../../i18n/pl/formatter.ts \
 	 ../../../i18n/pt/formatter.ts \
 	 ../../../i18n/pt_BR/formatter.ts \
 	 ../../../i18n/sl/formatter.ts \
 	 ../../../i18n/zh_CN/formatter.ts \
 	 ../../../i18n/zh_TW/formatter.ts