summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-02 09:30:02 (UTC)
committer mickeyl <mickeyl>2004-04-02 09:30:02 (UTC)
commit40aa649f8f8a15df709ef65e43fa8fb1b7933b4a (patch) (side-by-side diff)
treeb48f7036f60fe2875a288fd68072c40fd95abd87
parenta31c8ad914e72b874062dcb31e72476aca735bb0 (diff)
downloadopie-40aa649f8f8a15df709ef65e43fa8fb1b7933b4a.zip
opie-40aa649f8f8a15df709ef65e43fa8fb1b7933b4a.tar.gz
opie-40aa649f8f8a15df709ef65e43fa8fb1b7933b4a.tar.bz2
eliminate bogus CONFIG scope 'qtopia'. What does that mean? ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/server.pro2
-rw-r--r--core/tools/quicklauncher/quicklauncher.pro2
-rw-r--r--noncore/multimedia/opierec/opierec.pro2
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,35 +1,35 @@
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 \
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,33 +1,33 @@
-#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