-rw-r--r-- | noncore/settings/sound/main.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/sound/opie-vmemo-settings.control | 2 | ||||
-rw-r--r-- | noncore/settings/sound/sound.pro | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp index d919ce4..49497c3 100644 --- a/noncore/settings/sound/main.cpp +++ b/noncore/settings/sound/main.cpp @@ -1,29 +1,28 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "soundsettings.h" -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control index 2fdbc0c..906bcbf 100644 --- a/noncore/settings/sound/opie-vmemo-settings.control +++ b/noncore/settings/sound/opie-vmemo-settings.control @@ -1,12 +1,12 @@ Package: opie-vmemo-settings Files: plugins/application/libsound.so* bin/sound apps/Settings/Sound.desktop Priority: optional Section: opie/settings Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm Arch: iPAQ Conflicts: opie-sound -Depends: task-opie-minimal +Depends: task-opie-minimal, liopiecore2 Description: Sound settings dialog For the Opie environment. Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index cdcf8d6..9925e5b 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -1,10 +1,10 @@ CONFIG += qt warn_on release quick-app HEADERS = soundsettings.h soundsettingsbase.h SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp #INTERFACES = soundsettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 TARGET = sound include ( $(OPIEDIR)/include.pro ) |