-rw-r--r-- | gammu/emb/common/common.pro | 8 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kcmkdepimconfig.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro index 7cbcb17..0c68000 100644 --- a/gammu/emb/common/common.pro +++ b/gammu/emb/common/common.pro | |||
@@ -138,17 +138,16 @@ service/backup/backlmb.c \ | |||
138 | service/backup/backtext.c \ | 138 | service/backup/backtext.c \ |
139 | service/backup/backvcs.c \ | 139 | service/backup/backvcs.c \ |
140 | service/backup/backvcf.c \ | 140 | service/backup/backvcf.c \ |
141 | service/backup/backics.c \ | 141 | service/backup/backics.c \ |
142 | device/bluetoth/affix.c \ | 142 | device/bluetoth/affix.c \ |
143 | device/bluetoth/bluez.c \ | 143 | device/bluetoth/bluez.c \ |
144 | device/bluetoth/blue_w32.c \ | 144 | device/bluetoth/blue_w32.c \ |
145 | device/bluetoth/bluetoth.c \ | 145 | device/bluetoth/bluetoth.c \ |
146 | device/serial/ser_unx.c \ | ||
147 | device/serial/ser_djg.c \ | 146 | device/serial/ser_djg.c \ |
148 | device/irda/irda.c \ | 147 | device/irda/irda.c \ |
149 | device/devfunc.c \ | 148 | device/devfunc.c \ |
150 | protocol/at/at.c \ | 149 | protocol/at/at.c \ |
151 | protocol/alcatel/alcabus.c \ | 150 | protocol/alcatel/alcabus.c \ |
152 | protocol/nokia/mbus2.c \ | 151 | protocol/nokia/mbus2.c \ |
153 | protocol/nokia/fbus2.c \ | 152 | protocol/nokia/fbus2.c \ |
154 | protocol/nokia/phonet.c \ | 153 | protocol/nokia/phonet.c \ |
@@ -172,8 +171,15 @@ phone/nokia/nfunc.c \ | |||
172 | phone/nokia/nfuncold.c \ | 171 | phone/nokia/nfuncold.c \ |
173 | phone/obex/obexgen.c \ | 172 | phone/obex/obexgen.c \ |
174 | phone/symbian/mroutgen.c | 173 | phone/symbian/mroutgen.c |
175 | 174 | ||
176 | TARGET = microgammu | 175 | TARGET = microgammu |
177 | DESTDIR = ../../../bin | 176 | DESTDIR = ../../../bin |
178 | OBJECTS_DIR = obj/unix | 177 | OBJECTS_DIR = obj/unix |
179 | MOC_DIR = moc/unix | 178 | MOC_DIR = moc/unix |
179 | |||
180 | unix: { | ||
181 | SOURCES += device/serial/ser_unx.c | ||
182 | } | ||
183 | win32:{ | ||
184 | SOURCES += device/serial/ser_w32.c | ||
185 | } | ||
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp index 77a294a..830d5d2 100644 --- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp +++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp | |||
@@ -35,24 +35,24 @@ $Id$ | |||
35 | //#include <klocale.h> | 35 | //#include <klocale.h> |
36 | //#include <stdlib.h> | 36 | //#include <stdlib.h> |
37 | 37 | ||
38 | #include "kdepimconfigwidget.h" | 38 | #include "kdepimconfigwidget.h" |
39 | 39 | ||
40 | #include "kcmkdepimconfig.h" | 40 | #include "kcmkdepimconfig.h" |
41 | #include "kprefs.h" | 41 | #include "kprefs.h" |
42 | #include "kpimprefs.h" | 42 | #include "kpimprefs.h" |
43 | 43 | #ifndef _WIN32_ | |
44 | extern "C" | 44 | extern "C" |
45 | { | 45 | { |
46 | KCModule *create_kabconfig( QWidget *parent, const char * ) { | 46 | KCModule *create_kabconfig( QWidget *parent, const char * ) { |
47 | return new KCMKdePimConfig( parent, "kcmkdepimconfig" ); | 47 | return new KCMKdePimConfig( parent, "kcmkdepimconfig" ); |
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | #endif | |
51 | KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name ) | 51 | KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name ) |
52 | : KCModule( parent, name ) | 52 | : KCModule( parent, name ) |
53 | { | 53 | { |
54 | //abort(); | 54 | //abort(); |
55 | QVBoxLayout *layout = new QVBoxLayout( this ); | 55 | QVBoxLayout *layout = new QVBoxLayout( this ); |
56 | mConfigWidget = new KDEPIMConfigWidget( this, "mConfigWidget" ); | 56 | mConfigWidget = new KDEPIMConfigWidget( this, "mConfigWidget" ); |
57 | layout->addWidget( mConfigWidget ); | 57 | layout->addWidget( mConfigWidget ); |
58 | layout->setSpacing( 0 ); | 58 | layout->setSpacing( 0 ); |