From dbe74582a6602b87012728369d56dec059cc449e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 28 Feb 2013 15:31:57 +0100 Subject: remove unused member Option::application_argv0 Use QMakeGlobals::qmake_abslocation instead. Change-Id: I1d0f39549b477ede674730937d879c492407fb28 Reviewed-by: Oswald Buddenhagen --- qmake/option.cpp | 3 --- qmake/option.h | 1 - 2 files changed, 4 deletions(-) (limited to 'qmake') diff --git a/qmake/option.cpp b/qmake/option.cpp index fdf11d9266..983d3490d8 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -57,7 +57,6 @@ ProFileCache *Option::proFileCache; QMakeParser *Option::parser; //convenience -const char *Option::application_argv0 = 0; QString Option::prf_ext; QString Option::prl_ext; QString Option::libtool_ext; @@ -318,13 +317,11 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) int Option::init(int argc, char **argv) { - Option::application_argv0 = 0; Option::prf_ext = ".prf"; Option::pro_ext = ".pro"; Option::field_sep = ' '; if(argc && argv) { - Option::application_argv0 = argv[0]; QString argv0 = argv[0]; if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING) Option::qmake_mode = default_mode(argv0); 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, -- cgit v1.2.3 From ebc4fb452ac268657023cb957c1b0ca0e315b9fc Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 1 Mar 2013 10:54:45 +0100 Subject: define NDEBUG in MSVC/nmake release builds Some headers, like assert.h, check for the presence of NDEBUG. We already define NDEBUG for MSVC/vcproj release builds. Task-number: QTBUG-3389 Change-Id: I3b1510d47ff80611aa8072e66492ff2d648393eb Reviewed-by: Oswald Buddenhagen --- qmake/generators/win32/msvc_nmake.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qmake') diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 8b40d4e935..01243defd3 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -304,6 +304,11 @@ void NmakeMakefileGenerator::init() project->values("QMAKE_CLEAN").append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk"); project->values("QMAKE_CLEAN").append("vc*.pdb"); project->values("QMAKE_CLEAN").append("vc*.idb"); + project->values("DEFINES").removeAll("NDEBUG"); + } else { + ProStringList &defines = project->values("DEFINES"); + if (!defines.contains("NDEBUG")) + defines.append("NDEBUG"); } } -- cgit v1.2.3