summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-07-31 12:51:38 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:38:00 +0000
commitb0060d1056d6d1752d91652261de97db909c7862 (patch)
tree6f4a13108e51d349617e708a16ea13b00e9546e0 /src
parentf54f7d847099db448223fd630c5416b6fbd84c9e (diff)
configure: un-namespace remaining non-inline configure tests
only few tests remain, and many of these were mis-classified anyway. Change-Id: Ic3bc96928a0c79fe77b9ec10e6508d4822f18df2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/configure.json10
-rw-r--r--src/network/configure.json6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 5596280250..91f7bb4fd6 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -49,7 +49,7 @@
"gnu_iconv": {
"label": "GNU libiconv",
"export": "iconv",
- "test": "unix/gnu-libiconv",
+ "test": "gnu-libiconv",
"sources": [
"-liconv"
]
@@ -267,12 +267,12 @@
"posix-iconv": {
"label": "POSIX iconv",
"type": "compile",
- "test": "unix/iconv"
+ "test": "iconv"
},
"sun-iconv": {
"label": "SUN libiconv",
"type": "compile",
- "test": "unix/sun-libiconv"
+ "test": "sun-libiconv"
},
"inotify": {
"label": "inotify",
@@ -364,7 +364,7 @@
"xlocalescanprint": {
"label": "xlocale.h (or equivalents)",
"type": "compile",
- "test": "common/xlocalescanprint"
+ "test": "xlocalescanprint"
}
},
@@ -774,7 +774,7 @@ You need to use libdouble-conversion for double/string conversion."
"condition": "!tests.atomicfptr",
"message": "detected a std::atomic implementation that fails for function pointers.
Please apply the patch corresponding to your Standard Library vendor, found in
- qtbase/config.tests/common/atomicfptr"
+ qtbase/config.tests/atomicfptr"
}
],
diff --git a/src/network/configure.json b/src/network/configure.json
index c77004d4ba..6e7ce25051 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -25,7 +25,7 @@
"corewlan": {
"label": "CoreWLan",
"export": "",
- "test": "mac/corewlan",
+ "test": "corewlan",
"sources": [
"-framework CoreWLAN -framework Foundation"
]
@@ -53,7 +53,7 @@
"openssl_headers": {
"label": "OpenSSL Headers",
"export": "openssl",
- "test": "unix/openssl",
+ "test": "openssl",
"sources": [
{
"comment": "placeholder for OPENSSL_PATH",
@@ -63,7 +63,7 @@
},
"openssl": {
"label": "OpenSSL",
- "test": "unix/openssl",
+ "test": "openssl",
"sources": [
{ "type": "openssl" },
{