From b936b959650128bb8befaaa069477629105c680d Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 7 Mar 2012 14:07:07 +0000 Subject: EGLFS: Integrate building into configure. With the move to the QPA architecture EGL is now only required by individual platform plugins and the configure script has been adjusted to reflect this. Change-Id: Ieadacef0b970f29752d9e3e36a007e5cbb005b0d Reviewed-by: Oswald Buddenhagen Reviewed-by: Girish Ramakrishnan --- tools/configure/configureapp.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 5a6a04aee0..0c9907f6d5 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1544,8 +1544,6 @@ bool Configure::displayHelp() desc("OPENVG", "no","-no-openvg", "Disables OpenVG functionality\n"); desc("OPENVG", "yes","-openvg", "Enables OpenVG functionality"); - desc( "", "Requires EGL support, typically supplied by an OpenGL", false, ' '); - desc( "", "or other graphics implementation\n", false, ' '); desc( "-force-asserts", "Activate asserts in release mode.\n"); #endif desc( "-platform ", "The operating system and compiler you are building on.\n(default %QMAKESPEC%)\n"); @@ -2850,10 +2848,6 @@ void Configure::generateConfigfiles() if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; - if (dictionary["OPENGL_ES_CM"] == "no" && - dictionary["OPENGL_ES_2"] == "no" && - dictionary["OPENVG"] == "no") qconfigList += "QT_NO_EGL"; - if (dictionary["OPENGL_ES_CM"] == "yes" || dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES"; -- cgit v1.2.3 From 4cc9523a3153a0e7b012de3919e0c4f4ccb96265 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Tue, 20 Mar 2012 21:01:20 -0700 Subject: Make architecture detection more robust. Any message/error in mkspecs or qmake feature files ends up confusing the current arch detection logic. Instead, search for "Project MESSAGE: .* Architecture: ". Change-Id: I308932a5b75f3a1fcbc4fe30c74faf2e83b2d752 Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0c9907f6d5..58ffd28ff3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2584,32 +2584,9 @@ void Configure::detectArch() if (output.isEmpty()) continue; - // strip everything up to and including 'Project MESSAGE: ' - QString ProjectMESSAGE = QStringLiteral("Project MESSAGE: "); - int at = output.indexOf(ProjectMESSAGE); - if (at != -1) - output = output.mid(at + ProjectMESSAGE.length()); - - // strip lines beginning with a # - at = 0; - while ((at = output.indexOf('#', at)) != -1) { - if (at > 0 && output.at(at - 1) != '\n') { - // # isnt' at the beginning of a line, skip it - ++at; - continue; - } - - int eol = output.indexOf('\n', at); - if (eol == -1) { - // end of string - output.remove(at, output.length() - at); - break; - } - - output.remove(at, eol - at + 1); - } - - dictionary[key] = output.simplified(); + QRegExp re("Project MESSAGE:.*Architecture: ([a-zA-Z0-9]*)"); + if (re.indexIn(output) != -1) + dictionary[key] = re.cap(1); } if (!dictionary.contains("QT_HOST_ARCH")) -- cgit v1.2.3 From 70a88331519e6e6439ff23a9cc91b2e3f607acb6 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 23 Mar 2012 07:02:47 +0100 Subject: configure: Fix x86_64 detection The regular expression should look for underscores in addition to alphanumeric characters. Change-Id: Idc3dbd67291ec1420f818d74fba8413b1e7cbcf1 Reviewed-by: Girish Ramakrishnan Reviewed-by: Bradley T. Hughes --- tools/configure/configureapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 58ffd28ff3..f47cff6fdd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2584,7 +2584,7 @@ void Configure::detectArch() if (output.isEmpty()) continue; - QRegExp re("Project MESSAGE:.*Architecture: ([a-zA-Z0-9]*)"); + QRegExp re("Project MESSAGE:.*Architecture: ([a-zA-Z0-9_]*)"); if (re.indexIn(output) != -1) dictionary[key] = re.cap(1); } -- cgit v1.2.3