summaryrefslogtreecommitdiff
authorzecke <zecke>2005-03-02 21:14:20 (UTC)
committer zecke <zecke>2005-03-02 21:14:20 (UTC)
commit7e3e1699927a16421eedf8f02d7c38ffe0de7bad (patch) (side-by-side diff)
treecbf06da240f1e53fa4d57e9ea636fd2008629f26
parentc53f94fe28e8ec62a48d82d952c3d5e6a2ab85f2 (diff)
downloadopie-7e3e1699927a16421eedf8f02d7c38ffe0de7bad.zip
opie-7e3e1699927a16421eedf8f02d7c38ffe0de7bad.tar.gz
opie-7e3e1699927a16421eedf8f02d7c38ffe0de7bad.tar.bz2
-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
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/qss/.cvsignore6
-rw-r--r--core/apps/qss/config.in4
-rw-r--r--core/apps/qss/main.cpp12
-rw-r--r--core/apps/qss/qss.pro10
-rw-r--r--packages1
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
@@ -16,16 +16,6 @@
** 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
@@ -39,7 +29,6 @@
#include <sys/resource.h>
#include <unistd.h>
-#ifndef SINGLE_EXEC
int main(int argc, char **argv)
{
QApplication a(argc, argv);
@@ -52,4 +41,3 @@ int main(int argc, char **argv)
// 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
@@ -182,6 +182,7 @@ CONFIG_QASHMONEY noncore/unsupported/qashmoney qashmoney.pro
CONFIG_QASTEROIDS noncore/games/qasteroids qasteroids.pro
CONFIG_QCOP core/apps/qcop qcop.pro
CONFIG_QPDF noncore/unsupported/qpdf qpdf.pro
+CONFIG_QSS core/apps/qss qss.pro
CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
CONFIG_QWS core/qws qws.pro
CONFIG_REMOTE noncore/tools/remote remote.pro