diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
| commit | 0963be63ce741ef6c7585358c3f3b1cb806b66e8 (patch) | |
| tree | 6f4964c196b8a52cb15e9efc0388b6a549574460 /tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa | |
| parent | 9e6a1351823b3ee3d7e380248f6ef42ff383b014 (diff) | |
| parent | eacfbbf64ef90dad8c5cb6b2c812ad64c1100779 (diff) | |
Merge remote-tracking branch 'qt/dev' into dev-highdpi
Conflicts:
src/gui/kernel/qsimpledrag.cpp
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
Diffstat (limited to 'tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa')
12 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent index 1cff3fd44f..1cff3fd44f 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent index 45f6d8e74e..45f6d8e74e 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent index 3436f20001..3436f20001 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent index c6e97f821f..c6e97f821f 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent index 4df2f0c2ac..4df2f0c2ac 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent Binary files differindex ab1d696dd7..ab1d696dd7 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent Binary files differindex c6ca61f9c8..c6ca61f9c8 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent index 67c3297611..67c3297611 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent index b19be3a497..b19be3a497 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent index 8eb1fb9c41..8eb1fb9c41 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent index 7f25c502dd..7f25c502dd 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent Binary files differindex 470fd6fe44..470fd6fe44 100755..100644 --- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent +++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent |