eliminate bogus CONFIG scope 'qtopia'. What does that mean? ;)

3 files changed, 3 insertions, 3 deletions

diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 441e3bf..053bb77 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -1,51 +1,51 @@
         TEMPLATE= app
 
-        CONFIG  += qtopia warn_on 
+        CONFIG  += qt warn_on 
 
         DESTDIR         = $$(OPIEDIR)/bin
 
         HEADERS         += server.h \
                   serverinterface.h \
                   launchertab.h \
                   documentlist.h \
                   appicons.h \
                   taskbar.h \
                   runningappbar.h \
                   applauncher.h \
                   stabmon.h \
                   inputmethods.h \
                   systray.h \
                   wait.h \
                   shutdownimpl.h \
                   launcher.h \
                   launcherview.h \
                   $$(OPIEDIR)/core/apps/calibrate/calibrate.h \
                   startmenu.h \
                   transferserver.h \
                   qcopbridge.h \
                   packageslave.h \
                   irserver.h \
                   firstuse.h \
         $$(OPIEDIR)/rsync/buf.h \
         $$(OPIEDIR)/rsync/checksum.h \
         $$(OPIEDIR)/rsync/command.h \
         $$(OPIEDIR)/rsync/emit.h \
         $$(OPIEDIR)/rsync/job.h \
         $$(OPIEDIR)/rsync/netint.h \
         $$(OPIEDIR)/rsync/protocol.h \
         $$(OPIEDIR)/rsync/prototab.h \
         $$(OPIEDIR)/rsync/rsync.h \
         $$(OPIEDIR)/rsync/search.h \
         $$(OPIEDIR)/rsync/stream.h \
         $$(OPIEDIR)/rsync/sumset.h \
         $$(OPIEDIR)/rsync/trace.h \
         $$(OPIEDIR)/rsync/types.h \
         $$(OPIEDIR)/rsync/util.h \
         $$(OPIEDIR)/rsync/whole.h \
         $$(OPIEDIR)/rsync/config_rsync.h \
         $$(OPIEDIR)/rsync/qrsync.h \
                   syncdialog.h \
                   serverapp.h \
                   qprocess.h \
                   screensaver.h \
         $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
diff --git a/core/tools/quicklauncher/quicklauncher.pro b/core/tools/quicklauncher/quicklauncher.pro
index 3cdbf60..927392d 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -1,15 +1,15 @@
         TEMPLATE= app
-        CONFIG  += qtopia warn_on 
+        CONFIG  += qt warn_on 
         DESTDIR         = $(OPIEDIR)/bin
 
         HEADERS         = dropins.h
         SOURCES         = main.cpp
         INTERFACES= 
 
         INCLUDEPATH+= $(OPIEDIR)/include
         LIBS       += -lqpe -lopiecore2 -lopieui2
 
         TARGET  = quicklauncher
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 080a5f2..7b08f0e 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -1,41 +1,41 @@
-#CONFIG   = qt qtopia warn_on  pdaudio
+#CONFIG   = qt warn_on  pdaudio
 CONFIG   = qt warn_on  opie
 #CONFIG    = qt warn_on  quick-app
 HEADERS   = adpcm.h \
         pixmaps.h \
         helpwindow.h \
         qtrec.h \
         device.h \
         wavFile.h \
         waveform.h
 SOURCES   = adpcm.c \
         helpwindow.cpp \
         main.cpp \
         qtrec.cpp \
         device.cpp \
         wavFile.cpp \
         waveform.cpp
 INTERFACES  =
 
 contains(CONFIG, pdaudio) {
 #  LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz
   LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2
   INCLUDEPATH += $(QPEDIR)/include
   DEPENDPATH  += $(QPEDIR)/include
   DEFINES += PDAUDIO
   DEFINES += THREADED
   TARGET    = qperec
 
 #  DESTDIR=$(QPEDIR)/bin
 }
 
 contains(CONFIG, opie) {
   INCLUDEPATH += $(OPIEDIR)/include
   DEPENDPATH  += $(OPIEDIR)/include
   DESTDIR=$(OPIEDIR)/bin
   LIBS            += -lqpe -lopiecore2 -lpthread
   TARGET    = opierec
   include ( $(OPIEDIR)/include.pro )
 }