Skip to content
Permalink
Browse files
Merge ../../qt5/qtbase into mer-5.6
  • Loading branch information
pvuorela committed Nov 3, 2017
2 parents 70659f7 + e6f8b07 commit 2f452bbd6667efd94cd65e7d19af75e6c55486f1
Showing 703 changed files with 114,887 additions and 15,732 deletions.
@@ -4,4 +4,4 @@ CONFIG += warning_clean
QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD)

MODULE_VERSION = 5.6.2
MODULE_VERSION = 5.6.3
@@ -224,7 +224,7 @@ sub classNames {
}
if($line) {
$line =~ s,//.*$,,; #remove c++ comments
$line .= ";" if($line =~ m/^Q_[A-Z_]*\(.*\)[\r\n]*$/); #qt macro
$line .= ";" if($line =~ m/^Q_[A-Z_0-9]*\(.*\)[\r\n]*$/); #qt macro
$line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro
$line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE(_[A-Z]+)*[\r\n]*$/); #qt macro
$line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro
@@ -355,7 +355,7 @@ sub check_header {
$include = 0;
}
if ($include && $public_header) {
print STDERR "$lib: ERROR: $iheader includes private header $include\n" if ($include =~ /_p.h$/);
print STDERR "$lib: ERROR: $iheader includes private header $include\n" if ($include =~ /_p\.h$/);
for my $trylib (keys(%modules)) {
if (-e "$out_basedir/include/$trylib/$include") {
print STDERR "$lib: WARNING: $iheader includes $include when it should include $trylib/$include\n";
@@ -982,7 +982,7 @@ sub isQpaHeader
my $header_dirname = "";
foreach my $header (@headers) {
my $shadow = ($header =~ s/^\*//);
$header = 0 if($header =~ /^ui_.*.h/);
$header = 0 if ($header =~ /^ui_.*\.h$/);
foreach (@ignore_headers) {
$header = 0 if($header eq $_);
}
@@ -994,7 +994,7 @@ sub isQpaHeader
if(isQpaHeader($public_header)) {
$public_header = 0;
$qpa_header = 1;
} elsif($allheadersprivate || $thisprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
} elsif ($allheadersprivate || $thisprivate || $public_header =~ /_p(ch)?\.h$/) {
$public_header = 0;
} else {
foreach (@ignore_for_master_contents) {
@@ -1,6 +1 @@
mingw {
TMPPATH = $$(INCLUDE)
QMAKE_INCDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP)
TMPPATH = $$(LIB)
QMAKE_LIBDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP)
}
# This file exists only to detach the tests from the surroundings.
@@ -37,9 +37,10 @@ extern "C" {
#include <jpeglib.h>
}

j_compress_ptr cinfo;

int main(int, char **)
{
j_compress_ptr cinfo;
jpeg_create_compress(cinfo);
return 0;
}
@@ -34,6 +34,7 @@
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#endif

@@ -34,6 +34,7 @@
#ifdef BUILD_ON_MAC
#include <OpenGLES/ES2/gl.h>
#else
#define GL_GLEXT_PROTOTYPES
#include <GLES2/gl2.h>
#endif

@@ -34,6 +34,7 @@
#ifdef BUILD_ON_MAC
#include <OpenGLES/ES3/gl.h>
#else
#define GL_GLEXT_PROTOTYPES
#include <GLES3/gl3.h>
#endif

@@ -3116,14 +3116,14 @@ if [ "$Edition" = "OpenSource" ]; then
while true; do
if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then
echo "You are licensed to use this software under the terms of"
echo "the Lesser GNU General Public License (LGPL) versions 2.1."
echo "the GNU Lesser General Public License (LGPL) version 2.1."
echo "You are also licensed to use this software under the terms of"
echo "the GNU Lesser General Public License (LGPL) versions 3."
echo "the GNU Lesser General Public License (LGPL) version 3."
affix="either"
showLGPL2="yes"
else
echo "You are licensed to use this software under the terms of"
echo "the GNU Lesser General Public License (LGPL) versions 3."
echo "the GNU Lesser General Public License (LGPL) version 3."
showLGPL2="no"
affix="the"
fi
@@ -3137,7 +3137,7 @@ if [ "$Edition" = "OpenSource" ]; then
echo "Type '3' to view the GNU Lesser General Public License version 3."
fi
if [ "$showLGPL2" = "yes" ]; then
echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
echo "Type 'L' to view the GNU Lesser General Public License version 2.1."
fi
echo "Type 'yes' to accept this license offer."
echo "Type 'no' to decline this license offer."

0 comments on commit 2f452bb

Please sign in to comment.