diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:31:07 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:31:07 +0100 |
| commit | 198606f6dbca95ba3a170fff387327d8271018cd (patch) | |
| tree | 79e8c632f5277fc7f0ae30ae7fb1e1c41745c815 /src/corelib/plugin/qlibrary.cpp | |
| parent | 77c0c1ca6505eb66bd75b3766f9a498574822bd1 (diff) | |
| parent | 0d5ffd67a4748bcbf19dc3a4b9a36ae6314e58a6 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.h
Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076
Diffstat (limited to 'src/corelib/plugin/qlibrary.cpp')
0 files changed, 0 insertions, 0 deletions