wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.14'

Browse Source 
Conflicts:
	kaddressbook/merge/autotests/CMakeLists.txt
	kaddressbook/merge/autotests/mergecontactselectinformationscrollareatest.cpp
	kaddressbook/merge/autotests/mergecontactwidgettest.cpp
	kaddressbook/merge/manualmerge/mergecontactwidget.cpp
	kmail/mailmerge/widgets/mailmergewidget.cpp
	kmail/tests/CMakeLists.txt
wilder-work
Montel Laurent 11 years ago
parent 6ce1c9d901 26cb3ad42f
commit bb55c5db8c
23 changed files with 376 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      autotests/CMakeLists.txt
  2. 11
      autotests/unittestenv/config-mysql-db.xml
  3. 11
      autotests/unittestenv/config-mysql-fs.xml
  4. 11
      autotests/unittestenv/config-postgresql-db.xml
  5. 11
      autotests/unittestenv/config-postgresql-fs.xml
  6. 11
      autotests/unittestenv/config-sqlite-db.xml
  7. 9
      autotests/unittestenv/config.xml
  8. 4
      autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
  9. 4
      autotests/unittestenv/kdehome/share/config/akonadi_knut_resource_0rc
  10. 3
      autotests/unittestenv/kdehome/share/config/akonadi_knut_resource_1rc
  11. 3
      autotests/unittestenv/kdehome/share/config/akonadi_knut_resource_2rc
  12. 80
      autotests/unittestenv/kdehome/share/config/kdebugrc
  13. 3
      autotests/unittestenv/kdehome/share/config/kdedrc
  14. 76
      autotests/unittestenv/kdehome/testdata-res1.xml
  15. 6
      autotests/unittestenv/kdehome/testdata-res2.xml
  16. 4
      autotests/unittestenv/kdehome/testdata-res3.xml
  17. 82
      autotests/unittestenv/kdehome/testdata.xml
  18. 5
      autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc
  19. 6
      autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
  20. 9
      autotests/unittestenv/xdgconfig-postgresql.db/akonadi/akonadiserverrc
  21. 10
      autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
  22. 10
      autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
  23. 2
      mailmerge/widgets/mailmergewidget.cpp

13
autotests/CMakeLists.txt
Unescape View File

@ -24,13 +24,6 @@ add_executable( identityaddvcarddialogtest ${kmail_identityaddvcarddialog_sourc
ecm_mark_as_test(kmail-identityaddvcarddialogtest)
target_link_libraries( identityaddvcarddialogtest Qt5::Test Qt5::Widgets KF5::Completion KF5::KIOWidgets KF5::I18n)
set( kmail_followupreminderselectdatedialog_source followupreminderselectdatedialogtest.cpp ../followupreminder/followupreminderselectdatedialog.cpp )
add_executable( followupreminderselectdatedialogtest ${kmail_followupreminderselectdatedialog_source})
ecm_mark_as_test(kmail-followupreminderselectdatedialogtest)
target_link_libraries( followupreminderselectdatedialogtest Qt5::Test KF5::KIOWidgets KF5::I18n KF5::CalendarCore KF5::AkonadiCore KF5::AkonadiWidgets )
set( kmail_statusbarlabeltoggledstate_source statusbarlabeltoggledstatetest.cpp ../widgets/statusbarlabeltoggledstate.cpp ../kmail_debug.cpp)
add_executable(statusbarlabeltoggledstatetest ${kmail_statusbarlabeltoggledstate_source})
ecm_mark_as_test(kmail-statusbarlabeltoggledstatetest)
@ -49,3 +42,9 @@ add_test(cryptostateindicatorwidgettest cryptostateindicatorwidgettest)
ecm_mark_as_test(cryptostateindicatorwidgettest)
target_link_libraries( cryptostateindicatorwidgettest Qt5::Test messagecore)
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
add_akonadi_isolated_test_advanced( followupreminderselectdatedialogtest.cpp "../followupreminder/followupreminderselectdatedialog.cpp" "KF5::CalendarCore;KF5::AkonadiCore;KF5::AkonadiWidgets")

11
autotests/unittestenv/config-mysql-db.xml vendored
Unescape View File

@ -0,0 +1,11 @@
<config>
<kdehome>kdehome</kdehome>
<confighome>xdgconfig-mysql.db</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">mysql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">testsearchplugin</envvar>
</config>

11
autotests/unittestenv/config-mysql-fs.xml vendored
Unescape View File

@ -0,0 +1,11 @@
<config>
<kdehome>kdehome</kdehome>
<confighome>xdgconfig-mysql.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">mysql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">testsearchplugin</envvar>
</config>

11
autotests/unittestenv/config-postgresql-db.xml vendored
Unescape View File

@ -0,0 +1,11 @@
<config>
<kdehome>kdehome</kdehome>
<confighome>xdgconfig-postgresql.db</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">testsearchplugin</envvar>
</config>

11
autotests/unittestenv/config-postgresql-fs.xml vendored
Unescape View File

@ -0,0 +1,11 @@
<config>
<kdehome>kdehome</kdehome>
<confighome>xdgconfig-postgresql.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">testsearchplugin</envvar>
</config>

11
autotests/unittestenv/config-sqlite-db.xml vendored
Unescape View File

@ -0,0 +1,11 @@
<config>
<kdehome>kdehome</kdehome>
<confighome>xdgconfig-sqlite.db</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">sqlite</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

9
autotests/unittestenv/config.xml vendored
Unescape View File

@ -0,0 +1,9 @@
<config>
<kdehome>kdehome</kdehome>
<confighome>xdgconfig</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
</config>

4
autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc vendored
Unescape View File

@ -0,0 +1,4 @@
[ProcessedDefaults]
defaultaddressbook=done
defaultcalendar=done
defaultnotebook=done

4
autotests/unittestenv/kdehome/share/config/akonadi_knut_resource_0rc vendored
Unescape View File

@ -0,0 +1,4 @@
[General]
DataFile[$e]=$KDEHOME/testdata-res1.xml
FileWatchingEnabled=false

3
autotests/unittestenv/kdehome/share/config/akonadi_knut_resource_1rc vendored
Unescape View File

@ -0,0 +1,3 @@
[General]
DataFile[$e]=$KDEHOME/testdata-res2.xml
FileWatchingEnabled=false

3
autotests/unittestenv/kdehome/share/config/akonadi_knut_resource_2rc vendored
Unescape View File

@ -0,0 +1,3 @@
[General]
DataFile[$e]=$KDEHOME/testdata-res3.xml
FileWatchingEnabled=false

80
autotests/unittestenv/kdehome/share/config/kdebugrc vendored
Unescape View File

@ -0,0 +1,80 @@
DisableAll=false
[0]
AbortFatal=true
ErrorFilename[$e]=kdebug.dbg
ErrorOutput=2
FatalFilename[$e]=kdebug.dbg
FatalOutput=2
InfoFilename[$e]=kdebug.dbg
InfoOutput=2
WarnFilename[$e]=kdebug.dbg
WarnOutput=2
[264]
AbortFatal=true
ErrorFilename[$e]=kdebug.dbg
ErrorOutput=4
FatalFilename[$e]=kdebug.dbg
FatalOutput=4
InfoFilename[$e]=kdebug.dbg
WarnFilename[$e]=kdebug.dbg
WarnOutput=4
[5250]
InfoOutput=2
[7009]
AbortFatal=true
ErrorFilename[$e]=kdebug.dbg
ErrorOutput=4
FatalFilename[$e]=kdebug.dbg
FatalOutput=4
InfoFilename[$e]=kdebug.dbg
InfoOutput=4
WarnFilename[$e]=kdebug.dbg
WarnOutput=4
[7011]
AbortFatal=true
ErrorFilename[$e]=kdebug.dbg
ErrorOutput=4
FatalFilename[$e]=kdebug.dbg
FatalOutput=4
InfoFilename[$e]=kdebug.dbg
InfoOutput=4
WarnFilename[$e]=kdebug.dbg
WarnOutput=4
[7012]
AbortFatal=true
ErrorFilename[$e]=kdebug.dbg
ErrorOutput=4
FatalFilename[$e]=kdebug.dbg
FatalOutput=4
InfoFilename[$e]=kdebug.dbg
InfoOutput=4
WarnFilename[$e]=kdebug.dbg
WarnOutput=4
[7014]
AbortFatal=true
ErrorFilename[$e]=kdebug.dbg
ErrorOutput=0
FatalFilename[$e]=kdebug.dbg
FatalOutput=0
InfoFilename[$e]=kdebug.dbg
InfoOutput=0
WarnFilename[$e]=kdebug.dbg
WarnOutput=0
[7021]
AbortFatal=true
ErrorFilename[$e]=kdebug.dbg
ErrorOutput=4
FatalFilename[$e]=kdebug.dbg
FatalOutput=4
InfoFilename[$e]=kdebug.dbg
InfoOutput=4
WarnFilename[$e]=kdebug.dbg
WarnOutput=4

3
autotests/unittestenv/kdehome/share/config/kdedrc vendored
Unescape View File

@ -0,0 +1,3 @@
[General]
CheckSycoca=false
CheckFileStamps=false

76
autotests/unittestenv/kdehome/testdata-res1.xml vendored
Unescape View File

@ -0,0 +1,76 @@
<knut>
<collection rid="6" name="res1" content="inode/directory">
<collection rid="10" name="foo" content="inode/directory,application/octet-stream,text/directory,text/calendar,message/rfc822">
<collection rid="2" name="bar" content="inode/directory">
<collection rid="3" name="bla" content="inode/directory">
</collection>
</collection>
<collection rid="4" name="bla" content="inode/directory">
</collection>
<item rid="A" mimetype="application/octet-stream">
<payload>testmailbody</payload>
<attribute type="HEAD">From: &lt;test@user.tst&gt;</attribute>
<flag>\SEEN</flag>
<flag>\FLAGGED</flag>
<flag>\DRAFT</flag>
</item>
<item rid="B" mimetype="application/octet-stream">
<payload>testmailbody1</payload>
<attribute type="HEAD">From: &lt;test1@user.tst&gt;</attribute>
<flag>\FLAGGED</flag>
</item>
<item rid="C" mimetype="application/octet-stream">
<payload>testmailbody2</payload>
<attribute type="HEAD">From: &lt;test2@user.tst&gt;</attribute>
</item>
<item rid="D" mimetype="application/octet-stream">
<payload>testmailbody3</payload>
<attribute type="HEAD">From: &lt;test3@user.tst&gt;</attribute>
</item>
<item rid="E" mimetype="application/octet-stream">
<payload>testmailbody4</payload>
<attribute type="HEAD">From: &lt;test4@user.tst&gt;</attribute>
</item>
<item rid="F" mimetype="application/octet-stream">
<payload>testmailbody5</payload>
<attribute type="HEAD">From: &lt;test5@user.tst&gt;</attribute>
</item>
<item rid="G" mimetype="application/octet-stream">
<payload>testmailbody6</payload>
<attribute type="HEAD">From: &lt;test6@user.tst&gt;</attribute>
</item>
<item rid="H" mimetype="application/octet-stream">
<payload>testmailbody7</payload>
<attribute type="HEAD">From: &lt;test7@user.tst&gt;</attribute>
</item>
<item rid="I" mimetype="application/octet-stream">
<payload>testmailbody8</payload>
<attribute type="HEAD">From: &lt;test8@user.tst&gt;</attribute>
</item>
<item rid="J" mimetype="application/octet-stream">
<payload>testmailbody9</payload>
<attribute type="HEAD">From: &lt;test9@user.tst&gt;</attribute>
</item>
<item rid="K" mimetype="application/octet-stream">
<payload>testmailbody10</payload>
<attribute type="HEAD">From: &lt;test10@user.tst&gt;</attribute>
</item>
<item rid="L" mimetype="application/octet-stream">
<payload>testmailbody11</payload>
<attribute type="HEAD">From: &lt;test11@user.tst&gt;</attribute>
</item>
<item rid="M" mimetype="application/octet-stream">
<payload>testmailbody12</payload>
<attribute type="HEAD">From: &lt;test12@user.tst&gt;</attribute>
</item>
<item rid="N" mimetype="application/octet-stream">
<payload>testmailbody13</payload>
<attribute type="HEAD">From: &lt;test13@user.tst&gt;</attribute>
</item>
<item rid="O" mimetype="application/octet-stream">
<payload>testmailbody14</payload>
<attribute type="HEAD">From: &lt;test14@user.tst&gt;</attribute>
</item>
</collection>
</collection>
</knut>

6
autotests/unittestenv/kdehome/testdata-res2.xml vendored
Unescape View File

@ -0,0 +1,6 @@
<knut>
<collection rid="7" name="res2" content="inode/directory">
<collection rid="5" name="foo2" content=""/>
<collection rid="9" name="space folder" content=""/>
</collection>
</knut>

4
autotests/unittestenv/kdehome/testdata-res3.xml vendored
Unescape View File

@ -0,0 +1,4 @@
<knut>
<collection rid="8" name="res3" content="inode/directory,application/octet-stream">
</collection>
</knut>

82
autotests/unittestenv/kdehome/testdata.xml vendored
Unescape View File

@ -0,0 +1,82 @@
<knut>
<collection rid="6" name="res1" content="inode/directory">
<collection rid="10" name="foo" content="inode/directory,application/octet-stream,text/directory,text/calendar">
<collection rid="2" name="bar" content="inode/directory">
<collection rid="3" name="bla" content="inode/directory">
</collection>
</collection>
<collection rid="4" name="bla" content="inode/directory">
</collection>
<item rid="A" mimetype="application/octet-stream">
<payload>testmailbody</payload>
<attribute type="HEAD">From: &lt;test@user.tst&gt;</attribute>
<flag>\SEEN</flag>
<flag>\FLAGGED</flag>
<flag>\DRAFT</flag>
</item>
<item rid="B" mimetype="application/octet-stream">
<payload>testmailbody1</payload>
<attribute type="HEAD">From: &lt;test1@user.tst&gt;</attribute>
<flag>\FLAGGED</flag>
</item>
<item rid="C" mimetype="application/octet-stream">
<payload>testmailbody2</payload>
<attribute type="HEAD">From: &lt;test2@user.tst&gt;</attribute>
</item>
<item rid="D" mimetype="application/octet-stream">
<payload>testmailbody3</payload>
<attribute type="HEAD">From: &lt;test3@user.tst&gt;</attribute>
</item>
<item rid="E" mimetype="application/octet-stream">
<payload>testmailbody4</payload>
<attribute type="HEAD">From: &lt;test4@user.tst&gt;</attribute>
</item>
<item rid="F" mimetype="application/octet-stream">
<payload>testmailbody5</payload>
<attribute type="HEAD">From: &lt;test5@user.tst&gt;</attribute>
</item>
<item rid="G" mimetype="application/octet-stream">
<payload>testmailbody6</payload>
<attribute type="HEAD">From: &lt;test6@user.tst&gt;</attribute>
</item>
<item rid="H" mimetype="application/octet-stream">
<payload>testmailbody7</payload>
<attribute type="HEAD">From: &lt;test7@user.tst&gt;</attribute>
</item>
<item rid="I" mimetype="application/octet-stream">
<payload>testmailbody8</payload>
<attribute type="HEAD">From: &lt;test8@user.tst&gt;</attribute>
</item>
<item rid="J" mimetype="application/octet-stream">
<payload>testmailbody9</payload>
<attribute type="HEAD">From: &lt;test9@user.tst&gt;</attribute>
</item>
<item rid="K" mimetype="application/octet-stream">
<payload>testmailbody10</payload>
<attribute type="HEAD">From: &lt;test10@user.tst&gt;</attribute>
</item>
<item rid="L" mimetype="application/octet-stream">
<payload>testmailbody11</payload>
<attribute type="HEAD">From: &lt;test11@user.tst&gt;</attribute>
</item>
<item rid="M" mimetype="application/octet-stream">
<payload>testmailbody12</payload>
<attribute type="HEAD">From: &lt;test12@user.tst&gt;</attribute>
</item>
<item rid="N" mimetype="application/octet-stream">
<payload>testmailbody13</payload>
<attribute type="HEAD">From: &lt;test13@user.tst&gt;</attribute>
</item>
<item rid="O" mimetype="application/octet-stream">
<payload>testmailbody14</payload>
<attribute type="HEAD">From: &lt;test14@user.tst&gt;</attribute>
</item>
</collection>
</collection>
<collection rid="7" name="res2" content="inode/directory">
<collection rid="5" name="foo2" content=""/>
<collection rid="9" name="space folder" content=""/>
</collection>
<collection rid="8" name="res3" content="inode/directory,application/octet-stream">
</collection>
</knut>

5
autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc vendored
Unescape View File

@ -0,0 +1,5 @@
[%General]
ExternalPayload=false
[Search]
Manager=Dummy

6
autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc vendored
Unescape View File

@ -0,0 +1,6 @@
[%General]
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy

9
autotests/unittestenv/xdgconfig-postgresql.db/akonadi/akonadiserverrc vendored
Unescape View File

@ -0,0 +1,9 @@
[%General]
Driver=QPSQL
ExternalPayload=false
[Search]
Manager=Dummy
[QPSQL]
StartServer=true

10
autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc vendored
Unescape View File

@ -0,0 +1,10 @@
[%General]
Driver=QPSQL
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy
[QPSQL]
StartServer=true

10
autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc vendored
Unescape View File

@ -0,0 +1,10 @@
[%General]
# This is a slightly adjusted version of the QSQLITE driver from Qt
# It is provided by akonadi itself
Driver=QSQLITE3
[Debug]
Tracer=null
[Search]
Manager=Dummy

2
mailmerge/widgets/mailmergewidget.cpp
Unescape View File

@ -62,7 +62,7 @@ MailMergeWidget::MailMergeWidget(QWidget *parent)
mStackedWidget->addWidget(mAddressbookWidget);
mCsvWidget = new MailMerge::CsvWidget;
mCsvWidget->setObjectName(QStringLiteral("cvswidget"));
mCsvWidget->setObjectName(QLatin1String("csvwidget"));
mStackedWidget->addWidget(mCsvWidget);

Write Preview
Loading…
Cancel
Save