6.6.1 original

This commit is contained in:
kleuter
2023-12-04 18:42:35 +01:00
parent 9bf343ceed
commit 8490fae44c
607 changed files with 15608 additions and 14647 deletions

View File

@ -44,7 +44,7 @@ isEmpty(ALL_ANDROID_ABIS): ALL_ANDROID_ABIS = arm64-v8a armeabi-v7a x86_64 x86
CONFIG += $$ANDROID_PLATFORM
ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "")
ANDROID_TARGET_SDK_VERSION = 31
ANDROID_TARGET_SDK_VERSION = 33
NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST
QMAKE_CC = $$NDK_LLVM_PATH/bin/clang

View File

@ -1,12 +0,0 @@
# 32-bit x86 nacl configuration.
QMAKE_CC = i686-nacl-gcc
QMAKE_CXX = i686-nacl-g++
QMAKE_LINK = i686-nacl-g++
QMAKE_LINK_SHLIB = i686-nacl-g++
QMAKE_AR = i686-nacl-ar q
QMAKE_OBJCOPY = i686-nacl-objcopy
QMAKE_NM = i686-nacl-nm -P
QMAKE_STRIP = i686-nacl-strip

View File

@ -1,12 +0,0 @@
# 32-bit x86 nacl configuration.
QMAKE_CC = x86_64-nacl-gcc
QMAKE_CXX = x86_64-nacl-g++
QMAKE_LINK = x86_64-nacl-g++
QMAKE_LINK_SHLIB = x86_64-nacl-g++
QMAKE_AR = x86_64-nacl-ar q
QMAKE_OBJCOPY = x86_64-nacl-objcopy
QMAKE_NM = x86_64-nacl-nm -P
QMAKE_STRIP = x86_64-nacl-strip

View File

@ -1,11 +0,0 @@
QMAKE_PLATFORM = nacl $$QMAKE_PLATFORM
# Work around linker crash when using PIC. We are building
# statically so this is safe.
QMAKE_CFLAGS_STATIC_LIB -= -fPIC
QMAKE_CFLAGS_SHLIB -= -fPIC
QMAKE_CXXFLAGS_STATIC_LIB -= -fPIC
QMAKE_CXXFLAGS_SHLIB -= -fPIC
QMAKE_LIBS_DYNLOAD -= -ldl
QMAKE_LIBS_OPENGL_ES2 = -lppapi_gles2

View File

@ -1,18 +0,0 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#define _POSIX_TIMERS
#include "qglobal.h"
// extra disabling.
#ifdef __native_client__
#define QT_NO_FSFILEENGINE
#endif
#define QT_NO_SOCKET_H
#define DIR void *
#define PATH_MAX 256
#include "qfunctions_nacl.h"
#include <pthread.h>

View File

@ -1,10 +0,0 @@
!qt: return()
win32 {
!console:contains(TEMPLATE, ".*app"): \
QT_PRIVATE += entrypoint_private
} else:uikit {
qt_depends = $$resolve_depends(QT, "QT.")
!watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?): \
QT_PRIVATE += entrypoint_private
}

View File

@ -69,6 +69,18 @@ unix {
}
}
# Load the entrypoint module if requested
entrypoint {
win32 {
!console:contains(TEMPLATE, ".*app"): \
QT_PRIVATE += entrypoint_private
} else:uikit {
qt_depends = $$resolve_depends(QT, "QT.")
!watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?): \
QT_PRIVATE += entrypoint_private
}
}
# Will automatically add plugins, so run first
contains(QT_CONFIG, permissions): load(permissions)

View File

@ -1,13 +0,0 @@
#
# qmake configuration for building with nacl-g++
#
include(../../common/linux.conf)
include(../../common/qws.conf)
include(../../common/gcc-base-unix.conf)
include(../../common/g++-unix.conf)
include(../../common/nacl/nacl-base.conf)
include(../../common/nacl/g++-nacl32.conf)
load(qt_config)

View File

@ -1,9 +0,0 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QPLATFORMDEFS_H
#define QPLATFORMDEFS_H
#include "../../common/nacl/qplatformdefs.h"
#include "../../common/posix/qplatformdefs.h"
#endif // QPLATFORMDEFS_H

View File

@ -1,13 +0,0 @@
#
# qmake configuration for building with nacl-g++
#
include(../../common/linux.conf)
include(../../common/qws.conf)
include(../../common/gcc-base-unix.conf)
include(../../common/g++-unix.conf)
include(../../common/nacl/nacl64-base.conf)
include(../../common/nacl/g++-nacl64.conf)
load(qt_config)

View File

@ -1,9 +0,0 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QPLATFORMDEFS_H
#define QPLATFORMDEFS_H
#include "../../common/nacl/qplatformdefs.h"
#include "../../common/posix/qplatformdefs.h"
#endif // QPLATFORMDEFS_H