-Build qss by updating the qss.pro

-Add a .cvsignore file
-Make it selectable/buildable in our buildsystem by adding it to packages
 and creating a config.in

5 files changed, 16 insertions, 17 deletions

diff --git a/core/apps/qss/.cvsignore b/core/apps/qss/.cvsignore
new file mode 100644
index 0000000..84e01fa
--- a/dev/null
+++ b/core/apps/qss/.cvsignore
@@ -0,0 +1,6 @@
+.moc
+.ui
+*.moc
+moc_*
+Makefile
+qss
diff --git a/core/apps/qss/config.in b/core/apps/qss/config.in
new file mode 100644
index 0000000..86417b6
--- a/dev/null
+++ b/core/apps/qss/config.in
@@ -0,0 +1,4 @@
+  config QSS
+    boolean "A Sound Server for Qt 2.3.x where x >= 10 (qss)"
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/apps/qss/main.cpp b/core/apps/qss/main.cpp
index b92c51e..37766f2 100644
--- a/core/apps/qss/main.cpp
+++ b/core/apps/qss/main.cpp
@@ -1,55 +1,43 @@
 /**********************************************************************
 ** Copyright (C) 2000-2005 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 ** 
 ** This program is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by the
 ** Free Software Foundation; either version 2 of the License, or (at your
 ** option) any later version.
 ** 
 ** A copy of the GNU GPL license version 2 is included in this package as 
 ** LICENSE.GPL.
 **
 ** This program is distributed in the hope that it will be useful, but
 ** WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 ** See the GNU General Public License for more details.
 **
-** In addition, as a special exception Trolltech gives permission to link
-** the code of this program with Qtopia applications copyrighted, developed
-** and distributed by Trolltech under the terms of the Qtopia Personal Use
-** License Agreement. You must comply with the GNU General Public License
-** in all respects for all of the code used other than the applications
-** licensed under the Qtopia Personal Use License Agreement. If you modify
-** this file, you may extend this exception to your version of the file,
-** but you are not obligated to do so. If you do not wish to do so, delete
-** this exception statement from your version.
-** 
 ** 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 <qsoundqss_qws.h>
 #include <qtopia/qpeapplication.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
 
-#ifndef SINGLE_EXEC
 int main(int argc, char **argv) 
 {
     QApplication a(argc, argv);
     (void)new QWSSoundServer(0);
 
     //if (1) {
     // later, check if root first
         setpriority(PRIO_PROCESS, 0, -15);
     //}
     // hook up some quit mech.
     return a.exec();
 }
-#endif
diff --git a/core/apps/qss/qss.pro b/core/apps/qss/qss.pro
index f4f46dd..277f239 100644
--- a/core/apps/qss/qss.pro
+++ b/core/apps/qss/qss.pro
@@ -1,10 +1,10 @@
-        CONFIG  += qtopiaapp
-        CONFIG  -= buildQuicklaunch
+        CONFIG  += release
         SOURCES         = main.cpp
 
         TARGET  = qss
-TRANSLATABLES   = $$SOURCES
+DESTDIR         = $(OPIEDIR)/bin
 
-PACKAGE_DESCRIPTION=QWS Sound Server
+INCLUDEPATH    += $(OPIEDIR)/include
+DEPENDSPATH    += $(OPIEDIR)/include
 
-TRANSLATIONS=
+include( $(OPIEDIR)/include.pro )
diff --git a/packages b/packages
index f47fca6..075acb0 100644
--- a/packages
+++ b/packages
@@ -161,48 +161,49 @@ CONFIG_OPIEPLAYER	core/multimedia/opieplayer	opieplayer.pro
         CONFIG_OPIE-RDESKTOP    noncore/net/opierdesktopopierdesktop.pro
         CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
         CONFIG_OPIEREC          noncore/multimedia/opierecopierec.pro
         CONFIG_OPIE-SHEET       noncore/apps/opie-sheetopie-sheet.pro
         CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
         CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
         CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OSEARCH  core/pim/osearchosearch.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
         CONFIG_PACKAGEMANAGER   noncore/settings/packagemanagerpackagemanager.pro
         CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
         CONFIG_PHASE    noncore/styles/phasephase.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
 CONFIG_PIMCONVERTER     noncore/tools/pimconverter converter.pro
         CONFIG_POWERCHORD       noncore/multimedia/powerchordpowerchord.pro
 CONFIG_PPP      noncore/settings/networksettings/ppp    ppp.pro
         CONFIG_PYQUICKLAUNCH-APPLET     noncore/applets/pyquicklaunchpyquicklaunch.pro
         CONFIG_PYQUICKLAUNCHER  noncore/tools/pyquicklauncherpyquicklauncher.pro
         CONFIG_PYTHON-EXAMPLESexamples/python bla.pro
         CONFIG_QASHMONEY        noncore/unsupported/qashmoneyqashmoney.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
         CONFIG_QPDF     noncore/unsupported/qpdfqpdf.pro
+        CONFIG_QSS      core/apps/qssqss.pro
 CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
         CONFIG_QWS      core/qwsqws.pro
         CONFIG_REMOTE   noncore/tools/remoteremote.pro
         CONFIG_RESTARTAPPLET2   core/applets/restartapplet2restartapplet2.pro
         CONFIG_RESTARTAPPLET    core/applets/restartappletrestartapplet.pro
         CONFIG_ROTATEAPPLET     core/applets/rotateappletrotateapplet.pro
         CONFIG_ROTATION         noncore/settings/rotationrotation.pro
         CONFIG_RUNAPPLET        core/applets/runappletrunapplet.pro
         CONFIG_SCREENSHOTAPPLET         core/applets/screenshotappletscreenshotapplet.pro
         CONFIG_SECURITY         core/settings/securitysecurity.pro
         CONFIG_MULTIAUTH_DEMO core/settings/security/demomultiauth.pro
         CONFIG_SFCAVE   noncore/games/sfcavesfcave.pro
         CONFIG_SFCAVE-SDL       noncore/games/sfcave-sdlsfcave-sdl.pro
         CONFIG_SHOWIMG  noncore/multimedia/showimgshowimg.pro
 CONFIG_SIMPLE_EXAMPLE   examples/simple simple.pro
 CONFIG_SIMPLE_ICON      examples/simple-icon    simple-icon.pro
 CONFIG_SIMPLE_MAIN      examples/simple-main    simple-main.pro
         CONFIG_SIMPLE   noncore/tools/calc2/simplesimple.pro
 CONFIG_SIMPLE_PIM       examples/simple-pim     simple-pim.pro
         CONFIG_SINGLE   singlesingle.pro
         CONFIG_SNAKE    noncore/games/snakesnake.pro
         CONFIG_SOLITAIRE        noncore/games/solitairesolitaire.pro
         CONFIG_SOUND    noncore/settings/soundsound.pro
         CONFIG_SSHKEYS  noncore/settings/sshkeyssshkeys.pro