Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2019-01-15 10:53:33 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2019-01-15 10:55:04 (GMT) |
| commit | e618ab44aa09d6b69b08b14d43ee9ff2dd6abb0e (patch) | |
| tree | 8e84092fba2f6a01b75b8cf313208aa2c8897216 /Swift/QtUI | |
| parent | 6f6ad903d9e248f59bddedb3ab4cae41a7d8bec0 (diff) | |
| parent | 6874d64ed2684d83cb3e340f58f6c8c5089aa857 (diff) | |
| download | swift-e618ab44aa09d6b69b08b14d43ee9ff2dd6abb0e.zip swift-e618ab44aa09d6b69b08b14d43ee9ff2dd6abb0e.tar.bz2 | |
Merge tag 'swift-4.x' into master
* branch 'swift-4.x':
Update for Debian
Don't crash on missing bookmark result
Add missing include for QAbstractItemModel
Update Debian changelog
Fix convertToWindowsVersion() function to handle more RCs
Fix error response handling when requesting VCards
Test-Information:
./scons test=all succeeded on macOS 10.14.2.
Change-Id: I99d20a8b0e1b0be501fbbe95adebbff15f510184
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchWindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h index d487a91..f67712e 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 Isode Limited. + * Copyright (c) 2010-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,6 +8,7 @@ #include <set> +#include <QAbstractItemModel> #include <QWizard> #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h> |