From f99f28de319218faecf1b8c73d67ac7781554d06 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Jul 2016 17:08:14 +0200 Subject: [PATCH] remove the [-no]-native-gestures options from configure.exe the code which they control is dead (due to not having been adjusted to Q_WS_WIN disappearing). Change-Id: I4b939e10d33b9da3a5642f303a84f297549ba522 Reviewed-by: Lars Knoll --- tools/configure/configureapp.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b2775063b4..3a3794ee21 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -284,7 +284,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0) dictionary[ "INCREDIBUILD_XGE" ] = "auto"; dictionary[ "LTCG" ] = "no"; - dictionary[ "NATIVE_GESTURES" ] = "yes"; dictionary[ "MSVC_MP" ] = "no"; if (dictionary["QMAKESPEC"].startsWith("win32-g++")) { @@ -675,10 +674,6 @@ void Configure::parseCmdLine() dictionary[ "INCREDIBUILD_XGE" ] = "no"; else if (configCmdLine.at(i) == "-incredibuild-xge") dictionary[ "INCREDIBUILD_XGE" ] = "yes"; - else if (configCmdLine.at(i) == "-native-gestures") - dictionary[ "NATIVE_GESTURES" ] = "yes"; - else if (configCmdLine.at(i) == "-no-native-gestures") - dictionary[ "NATIVE_GESTURES" ] = "no"; // Others --------------------------------------------------- else if (configCmdLine.at(i) == "-widgets") dictionary[ "WIDGETS" ] = "yes"; @@ -1796,8 +1791,6 @@ bool Configure::displayHelp() desc("STYLE_WINDOWSXP", "auto", "", " windowsxp", ' '); desc("STYLE_WINDOWSVISTA", "auto", "", " windowsvista", ' '); desc("STYLE_FUSION", "yes", "", " fusion", ' '); - desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7."); - desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7.\n"); desc("MSVC_MP", "no", "-no-mp", "Do not use multiple processors for compiling with MSVC"); desc("MSVC_MP", "yes", "-mp", "Use multiple processors for compiling with MSVC (-MP).\n"); @@ -2643,9 +2636,6 @@ void Configure::generateOutputVars() if (dictionary["DIRECT2D"] == "yes") qtConfig += "direct2d"; - if (dictionary[ "NATIVE_GESTURES" ] == "yes") - qtConfig += "native-gestures"; - if (dictionary["NIS"] == "yes") qtConfig += "nis"; @@ -3305,7 +3295,6 @@ void Configure::generateConfigfiles() if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; if (dictionary["HARFBUZZ"] == "no") qconfigList += "QT_NO_HARFBUZZ"; - if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; if (dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES"; if (dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES_2";