diff options
author | kh1 <qt-info@nokia.com> | 2009-11-16 15:23:09 (GMT) |
---|---|---|
committer | kh1 <qt-info@nokia.com> | 2009-11-16 15:23:09 (GMT) |
commit | dd1ab7b8ed2c847d2ba3b19c007f545f6fb098df (patch) | |
tree | 3d43b559080d7518e89eb8ba7d0ffe88cbb357c6 /tools/assistant | |
parent | 9721df8d4e5c10c264863b0701e089c3aac13f4f (diff) | |
download | Qt-dd1ab7b8ed2c847d2ba3b19c007f545f6fb098df.zip Qt-dd1ab7b8ed2c847d2ba3b19c007f545f6fb098df.tar.gz Qt-dd1ab7b8ed2c847d2ba3b19c007f545f6fb098df.tar.bz2 |
Fix crash on windows running while without gui. Should be 4.6 main.
Reviewed-by: ck
Diffstat (limited to 'tools/assistant')
-rw-r--r-- | tools/assistant/tools/assistant/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp index 12bc5b1..9568df0 100644 --- a/tools/assistant/tools/assistant/main.cpp +++ b/tools/assistant/tools/assistant/main.cpp @@ -189,6 +189,7 @@ QString indexFilesFolder(const QString &collectionFile) int main(int argc, char *argv[]) { +#ifndef Q_OS_WIN // First do a quick search for arguments that imply command-line mode. const char * cmdModeArgs[] = { "-help", "-register", "-unregister", "-remove-search-index" @@ -202,8 +203,10 @@ int main(int argc, char *argv[]) } } } - QApplication a(argc, argv, useGui); +#else + QApplication a(argc, argv); +#endif a.addLibraryPath(a.applicationDirPath() + QLatin1String("/plugins")); CmdLineParser cmd; |