diff options
Diffstat (limited to 'src/corelib/kernel/qcorecmdlineargs_p.h')
| -rw-r--r-- | src/corelib/kernel/qcorecmdlineargs_p.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h index 70e41ac52a..151818b005 100644 --- a/src/corelib/kernel/qcorecmdlineargs_p.h +++ b/src/corelib/kernel/qcorecmdlineargs_p.h @@ -58,13 +58,11 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) +#ifdef Q_OS_WIN QT_BEGIN_INCLUDE_NAMESPACE -#include "QtCore/qvector.h" -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) -# include "qt_windows.h" -#endif +# include "QtCore/qvector.h" +# include <qt_windows.h> QT_END_INCLUDE_NAMESPACE // template implementation of the parsing algorithm @@ -132,7 +130,6 @@ static QVector<Char*> qWinCmdLine(Char *cmdParam, int length, int &argc) return argv; } -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) static inline QStringList qWinCmdArgs(QString cmdLine) // not const-ref: this might be modified { QStringList args; @@ -153,7 +150,7 @@ static inline QStringList qCmdLineArgs(int argc, char *argv[]) QString cmdLine = QString::fromWCharArray(GetCommandLine()); return qWinCmdArgs(cmdLine); } -#endif + #else // !Q_OS_WIN static inline QStringList qCmdLineArgs(int argc, char *argv[]) |