diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:59:14 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:59:14 +0100 |
| commit | 85e94c254a7205ac3e64379f34ca312a6b702234 (patch) | |
| tree | 8e47330b59ed5c7a2c04c41ad508ed5469d5349b /src/macdeployqt/macdeployqt/main.cpp | |
| parent | d1e639a800a105f4611c87f024664559c7d33aaa (diff) | |
| parent | 638c278b76c56a51f83ef8c5cc9c03f18a887f74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp
Change-Id: I8644f68ff02f00a377f82ea0b7520aa308f0a0df
Diffstat (limited to 'src/macdeployqt/macdeployqt/main.cpp')
| -rw-r--r-- | src/macdeployqt/macdeployqt/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp index 019fa835e..713724279 100644 --- a/src/macdeployqt/macdeployqt/main.cpp +++ b/src/macdeployqt/macdeployqt/main.cpp @@ -50,8 +50,8 @@ int main(int argc, char **argv) qDebug() << " -use-debug-libs : Deploy with debug versions of frameworks and plugins (implies -no-strip)"; qDebug() << " -executable=<path> : Let the given executable use the deployed frameworks too"; qDebug() << " -qmldir=<path> : Deploy imports used by .qml files in the given path"; - qDebug() << " -always-overwrite : Copy files enven if the target file exists"; - qDebug() << " -codesign=<ident> : Run codesing with the given identity on all executables"; + qDebug() << " -always-overwrite : Copy files even if the target file exists"; + qDebug() << " -codesign=<ident> : Run codesign with the given identity on all executables"; qDebug() << ""; qDebug() << "macdeployqt takes an application bundle as input and makes it"; qDebug() << "self-contained by copying in the Qt frameworks and plugins that"; |