| -rw-r--r-- | bin/kdepim/LICENCE.TXT | 59 | ||||
| -rw-r--r-- | gammu/emb/gammu/gammu.pro | 16 | ||||
| -rw-r--r-- | kaddressbook/mainembedded.cpp | 1 |
3 files changed, 14 insertions, 62 deletions
diff --git a/bin/kdepim/LICENCE.TXT b/bin/kdepim/LICENCE.TXT index 4d564f3..10e09f7 100644 --- a/bin/kdepim/LICENCE.TXT +++ b/bin/kdepim/LICENCE.TXT @@ -278,64 +278,5 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest - to attach them to the start of each source file to most effectively - convey the exclusion of warranty; and each file should have at least - the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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. - - 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. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the appropriate - parts of the General Public License. Of course, the commands you use may - be called something other than `show w' and `show c'; they could even be - mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - This General Public License does not permit incorporating your program into - proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the - library. If this is what you want to do, use the GNU Library General - Public License instead of this License.
\ No newline at end of file diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro index 299de7f..22476a1 100644 --- a/gammu/emb/gammu/gammu.pro +++ b/gammu/emb/gammu/gammu.pro @@ -45,8 +45,18 @@ SOURCES += gammu.c \ depend/nokia/dct3trac/wmx-sim.c \ depend/nokia/dct3trac/wmx-util.c \ depend/nokia/dct3trac/wmx.c - +unix : { LIBS += ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so /usr/lib/libsdp.so /usr/lib/libpthread.so -DESTDIR = ../../../bin OBJECTS_DIR = obj/unix -TARGET = kammu
\ No newline at end of file +} +win32 : { +CONFIG = qt warn_on +#LIBS += mfc71u.lib +LIBS += libc.lib +#LIBS += msvcrt.lib +QMAKE_LINK += /NODEFAULTLIB:msvcrt +LIBS += ../../../bin/microgammu.lib +OBJECTS_DIR = obj/win +} +DESTDIR = ../../../bin +TARGET = kammu diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 4230c07..4f48850 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -9,6 +9,7 @@ #endif #include <kstandarddirs.h> +#include <qregexp.h> #include <kglobal.h> #include <stdio.h> #include <qdir.h> |