summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--gammu/emb/gammu/gammu.pro5
-rw-r--r--kaddressbook/kaddressbook.pro6
-rw-r--r--korganizer/calendarview.cpp6
-rw-r--r--korganizer/korganizer.pro10
-rw-r--r--korganizer/kotodoview.h1
-rw-r--r--korganizer/koviewmanager.cpp5
6 files changed, 25 insertions, 8 deletions
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index 55bfdec..c8aa3f0 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -10,9 +10,10 @@ DEPENDPATH += msvc06.mak \
10 depend/siemens \ 10 depend/siemens \
11 depend/nokia/dct3trac 11 depend/nokia/dct3trac
12INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens 12INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
13 CONFIG = warn_off release console 13 CONFIG += warn_off console
14# Input 14# Input
15 15
16include( ../../../variables.pri )
16HEADERS += gammu.h \ 17HEADERS += gammu.h \
17 sniff.h \ 18 sniff.h \
18 smsd/s_files.h \ 19 smsd/s_files.h \
@@ -52,7 +53,7 @@ LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
52OBJECTS_DIR = obj/unix 53OBJECTS_DIR = obj/unix
53} 54}
54win32 : { 55win32 : {
55 CONFIG = qt warn_on 56 CONFIG += qt warn_on
56#LIBS += mfc71u.lib 57#LIBS += mfc71u.lib
57LIBS += libc.lib 58LIBS += libc.lib
58#LIBS += msvcrt.lib 59#LIBS += msvcrt.lib
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 7203eb3..f9d22d5 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -51,8 +51,12 @@ OBJECTS_DIR = obj/win
51MOC_DIR = moc/win 51MOC_DIR = moc/win
52#olimport section 52#olimport section
53#blabla: { 53#blabla: {
54 54debug: {
55LIBS += mfc71ud.lib
56}
57release: {
55LIBS += mfc71u.lib 58LIBS += mfc71u.lib
59}
56DEFINES += _OL_IMPORT_ 60DEFINES += _OL_IMPORT_
57HEADERS = ../outport/msoutl9.h \ 61HEADERS = ../outport/msoutl9.h \
58 kaimportoldialog.h 62 kaimportoldialog.h
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 904bbe2..a8ad467 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1658,8 +1658,10 @@ bool CalendarView::openCalendar(QString filename, bool merge)
1658 } 1658 }
1659 1659
1660 globalFlagBlockAgenda = 1; 1660 globalFlagBlockAgenda = 1;
1661 if (!merge) mCalendar->close(); 1661 if (!merge) {
1662 1662 mCalendar->close();
1663 mTodoList->clearList();
1664 }
1663 mStorage->setFileName( filename ); 1665 mStorage->setFileName( filename );
1664 1666
1665 if ( mStorage->load() ) { 1667 if ( mStorage->load() ) {
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index d88c300..32ad10a 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -56,17 +56,23 @@ LIBS += ../libical/lib/ical.lib
56LIBS += ../libical/lib/icalss.lib 56LIBS += ../libical/lib/icalss.lib
57#LIBS += atls.lib 57#LIBS += atls.lib
58QMAKE_LINK += /NODEFAULTLIB:LIBC 58QMAKE_LINK += /NODEFAULTLIB:LIBC
59#QMAKE_LINK += /NODEFAULTLIB:MSVCRT 59QMAKE_LINK += /NODEFAULTLIB:MSVCRT
60#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 60QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
61OBJECTS_DIR = obj/win 61OBJECTS_DIR = obj/win
62MOC_DIR = moc/win 62MOC_DIR = moc/win
63#olimport section 63#olimport section
64#blabla: { 64#blabla: {
65debug: {
66LIBS += mfc71ud.lib
67}
68release: {
65LIBS += mfc71u.lib 69LIBS += mfc71u.lib
70}
66DEFINES += _OL_IMPORT_ 71DEFINES += _OL_IMPORT_
67 72
68HEADERS += ../outport/msoutl9.h \ 73HEADERS += ../outport/msoutl9.h \
69 koimportoldialog.h 74 koimportoldialog.h
75
70SOURCES += ../outport/msoutl9.cpp \ 76SOURCES += ../outport/msoutl9.cpp \
71 koimportoldialog.cpp 77 koimportoldialog.cpp
72#} 78#}
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d368513..1ffc34a 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -139,6 +139,7 @@ class KOTodoView : public KOrg::BaseView
139 QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem); 139 QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
140 void setNavigator( DateNavigator* nav ) {mNavigator = nav;} 140 void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
141 QString getWhatsThisText(QPoint p); 141 QString getWhatsThisText(QPoint p);
142 void clearList() {mTodoListView->clear(); }
142 143
143 public slots: 144 public slots:
144 void updateView(); 145 void updateView();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2e5a943..fb4de37 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -831,5 +831,8 @@ void KOViewManager::addView(KOrg::BaseView *view)
831 831
832void KOViewManager::setDocumentId( const QString &id ) 832void KOViewManager::setDocumentId( const QString &id )
833{ 833{
834 if (mTodoView) mTodoView->setDocumentId( id ); 834 if (mTodoView) {
835 mTodoView->clearList();
836 mTodoView->setDocumentId( id );
837 }
835} 838}