diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:03:13 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-21 10:14:50 +0100 |
commit | 711c579ffa053acfe49879960bfb1b1b1b5f4c8b (patch) | |
tree | db9036908d52db1dedf74fe5dd07a9132d7c547d /src/libs/installer/messageboxhandler.cpp | |
parent | 515b96469d39c8dfd5ba823ecac371414c02e552 (diff) | |
parent | 7b584f55c2fee55aabd852aa836d6d8295ee1b22 (diff) |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: Ia5dd8dfbaa2289f1b167191d6997a5f4340721a2
Diffstat (limited to 'src/libs/installer/messageboxhandler.cpp')
-rw-r--r-- | src/libs/installer/messageboxhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp index 266558d93..86e28eb39 100644 --- a/src/libs/installer/messageboxhandler.cpp +++ b/src/libs/installer/messageboxhandler.cpp @@ -44,7 +44,7 @@ \qmltype QMessageBox \inqmlmodule scripting - \brief The QMessageBox type provides a modal dialog for informing the user or asking the user + \brief Provides a modal dialog for informing the user or asking the user a question and receiving an answer. |