author | zecke <zecke> | 2005-03-02 21:14:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-03-02 21:14:20 (UTC) |
commit | 7e3e1699927a16421eedf8f02d7c38ffe0de7bad (patch) (unidiff) | |
tree | cbf06da240f1e53fa4d57e9ea636fd2008629f26 | |
parent | c53f94fe28e8ec62a48d82d952c3d5e6a2ab85f2 (diff) | |
download | opie-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
-rw-r--r-- | core/apps/qss/.cvsignore | 6 | ||||
-rw-r--r-- | core/apps/qss/config.in | 4 | ||||
-rw-r--r-- | core/apps/qss/main.cpp | 12 | ||||
-rw-r--r-- | core/apps/qss/qss.pro | 10 | ||||
-rw-r--r-- | packages | 1 |
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 @@ | |||
1 | .moc | ||
2 | .ui | ||
3 | *.moc | ||
4 | moc_* | ||
5 | Makefile | ||
6 | 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 @@ | |||
1 | config QSS | ||
2 | boolean "A Sound Server for Qt 2.3.x where x >= 10 (qss)" | ||
3 | default "y" | ||
4 | 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 @@ | |||
16 | ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 16 | ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
17 | ** See the GNU General Public License for more details. | 17 | ** See the GNU General Public License for more details. |
18 | ** | 18 | ** |
19 | ** In addition, as a special exception Trolltech gives permission to link | ||
20 | ** the code of this program with Qtopia applications copyrighted, developed | ||
21 | ** and distributed by Trolltech under the terms of the Qtopia Personal Use | ||
22 | ** License Agreement. You must comply with the GNU General Public License | ||
23 | ** in all respects for all of the code used other than the applications | ||
24 | ** licensed under the Qtopia Personal Use License Agreement. If you modify | ||
25 | ** this file, you may extend this exception to your version of the file, | ||
26 | ** but you are not obligated to do so. If you do not wish to do so, delete | ||
27 | ** this exception statement from your version. | ||
28 | ** | ||
29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 19 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
30 | ** | 20 | ** |
31 | ** Contact info@trolltech.com if any conditions of this licensing are | 21 | ** Contact info@trolltech.com if any conditions of this licensing are |
@@ -39,7 +29,6 @@ | |||
39 | #include <sys/resource.h> | 29 | #include <sys/resource.h> |
40 | #include <unistd.h> | 30 | #include <unistd.h> |
41 | 31 | ||
42 | #ifndef SINGLE_EXEC | ||
43 | int main(int argc, char **argv) | 32 | int main(int argc, char **argv) |
44 | { | 33 | { |
45 | QApplication a(argc, argv); | 34 | QApplication a(argc, argv); |
@@ -52,4 +41,3 @@ int main(int argc, char **argv) | |||
52 | // hook up some quit mech. | 41 | // hook up some quit mech. |
53 | return a.exec(); | 42 | return a.exec(); |
54 | } | 43 | } |
55 | #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 @@ | |||
1 | CONFIG += qtopiaapp | 1 | CONFIG += release |
2 | CONFIG -= buildQuicklaunch | ||
3 | SOURCES = main.cpp | 2 | SOURCES = main.cpp |
4 | 3 | ||
5 | TARGET = qss | 4 | TARGET = qss |
6 | TRANSLATABLES = $$SOURCES | 5 | DESTDIR = $(OPIEDIR)/bin |
7 | 6 | ||
8 | PACKAGE_DESCRIPTION=QWS Sound Server | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDSPATH += $(OPIEDIR)/include | ||
9 | 9 | ||
10 | TRANSLATIONS= | 10 | include( $(OPIEDIR)/include.pro ) |
@@ -182,6 +182,7 @@ CONFIG_QASHMONEY noncore/unsupported/qashmoney qashmoney.pro | |||
182 | CONFIG_QASTEROIDS noncore/games/qasteroidsqasteroids.pro | 182 | CONFIG_QASTEROIDS noncore/games/qasteroidsqasteroids.pro |
183 | CONFIG_QCOP core/apps/qcopqcop.pro | 183 | CONFIG_QCOP core/apps/qcopqcop.pro |
184 | CONFIG_QPDF noncore/unsupported/qpdfqpdf.pro | 184 | CONFIG_QPDF noncore/unsupported/qpdfqpdf.pro |
185 | CONFIG_QSS core/apps/qssqss.pro | ||
185 | CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro | 186 | CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro |
186 | CONFIG_QWS core/qwsqws.pro | 187 | CONFIG_QWS core/qwsqws.pro |
187 | CONFIG_REMOTE noncore/tools/remoteremote.pro | 188 | CONFIG_REMOTE noncore/tools/remoteremote.pro |