diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 14:38:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-06 14:38:07 +0100 |
| commit | 49a2ec05b43b49d06dba8c6909c9df8d308e127d (patch) | |
| tree | 46d596c4c0e184aab0d4698f05247d1ed13c7e9a /qmake/option.h | |
| parent | b86106387350f673a20d3b0a2413023f6205169b (diff) | |
| parent | 31c5b34e808db102bfc5364405711ec94fe51f0a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/qnx/qqnxscreen.cpp
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h index 541757b264..6225f6b4d2 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -109,7 +109,6 @@ struct Option static QString pro_ext; static QString res_ext; static char field_sep; - static const char *application_argv0; enum CmdLineFlags { QMAKE_CMDLINE_SUCCESS = 0x00, |