summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/common.pro8
-rw-r--r--libkdepim/kcmconfigs/kcmkdepimconfig.cpp4
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
@@ -140,13 +140,12 @@ service/backup/backvcs.c \
140service/backup/backvcf.c \ 140service/backup/backvcf.c \
141service/backup/backics.c \ 141service/backup/backics.c \
142device/bluetoth/affix.c \ 142device/bluetoth/affix.c \
143device/bluetoth/bluez.c \ 143device/bluetoth/bluez.c \
144device/bluetoth/blue_w32.c \ 144device/bluetoth/blue_w32.c \
145device/bluetoth/bluetoth.c \ 145device/bluetoth/bluetoth.c \
146device/serial/ser_unx.c \
147device/serial/ser_djg.c \ 146device/serial/ser_djg.c \
148device/irda/irda.c \ 147device/irda/irda.c \
149device/devfunc.c \ 148device/devfunc.c \
150protocol/at/at.c \ 149protocol/at/at.c \
151protocol/alcatel/alcabus.c \ 150protocol/alcatel/alcabus.c \
152protocol/nokia/mbus2.c \ 151protocol/nokia/mbus2.c \
@@ -174,6 +173,13 @@ phone/obex/obexgen.c \
174phone/symbian/mroutgen.c 173phone/symbian/mroutgen.c
175 174
176TARGET = microgammu 175TARGET = microgammu
177DESTDIR = ../../../bin 176DESTDIR = ../../../bin
178OBJECTS_DIR = obj/unix 177OBJECTS_DIR = obj/unix
179MOC_DIR = moc/unix 178MOC_DIR = moc/unix
179
180unix: {
181SOURCES += device/serial/ser_unx.c
182}
183win32:{
184SOURCES += 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
@@ -37,20 +37,20 @@ $Id$
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_
44extern "C" 44extern "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
51KCMKdePimConfig::KCMKdePimConfig( QWidget *parent, const char *name ) 51KCMKdePimConfig::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" );