| -rw-r--r-- | gammu/emb/gammu/gammu.pro | 5 | ||||
| -rw-r--r-- | kaddressbook/kaddressbook.pro | 6 | ||||
| -rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
| -rw-r--r-- | korganizer/korganizer.pro | 10 | ||||
| -rw-r--r-- | korganizer/kotodoview.h | 1 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 5 |
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 @@ -11,7 +11,8 @@ DEPENDPATH += msvc06.mak \ depend/nokia/dct3trac INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens -CONFIG = warn_off release console +CONFIG += warn_off console # Input +include( ../../../variables.pri ) HEADERS += gammu.h \ sniff.h \ @@ -53,5 +54,5 @@ OBJECTS_DIR = obj/unix } win32 : { -CONFIG = qt warn_on +CONFIG += qt warn_on #LIBS += mfc71u.lib LIBS += libc.lib diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index 7203eb3..f9d22d5 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro @@ -52,6 +52,10 @@ MOC_DIR = moc/win #olimport section #blabla: { - +debug: { +LIBS += mfc71ud.lib +} +release: { LIBS += mfc71u.lib +} DEFINES += _OL_IMPORT_ HEADERS = ../outport/msoutl9.h \ diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 904bbe2..a8ad467 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1659,6 +1659,8 @@ bool CalendarView::openCalendar(QString filename, bool merge) globalFlagBlockAgenda = 1; - if (!merge) mCalendar->close(); - + if (!merge) { + mCalendar->close(); + mTodoList->clearList(); + } mStorage->setFileName( filename ); diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index d88c300..32ad10a 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro @@ -57,15 +57,21 @@ LIBS += ../libical/lib/icalss.lib #LIBS += atls.lib QMAKE_LINK += /NODEFAULTLIB:LIBC -#QMAKE_LINK += /NODEFAULTLIB:MSVCRT -#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib +QMAKE_LINK += /NODEFAULTLIB:MSVCRT +QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib OBJECTS_DIR = obj/win MOC_DIR = moc/win #olimport section #blabla: { +debug: { +LIBS += mfc71ud.lib +} +release: { LIBS += mfc71u.lib +} DEFINES += _OL_IMPORT_ HEADERS += ../outport/msoutl9.h \ koimportoldialog.h + SOURCES += ../outport/msoutl9.cpp \ koimportoldialog.cpp diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index d368513..1ffc34a 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -140,4 +140,5 @@ class KOTodoView : public KOrg::BaseView void setNavigator( DateNavigator* nav ) {mNavigator = nav;} QString getWhatsThisText(QPoint p); + void clearList() {mTodoListView->clear(); } public slots: diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2e5a943..fb4de37 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -832,4 +832,7 @@ void KOViewManager::addView(KOrg::BaseView *view) void KOViewManager::setDocumentId( const QString &id ) { - if (mTodoView) mTodoView->setDocumentId( id ); + if (mTodoView) { + mTodoView->clearList(); + mTodoView->setDocumentId( id ); + } } |