diff -ruN qtbase-opensource-src-5.5.1-orig/config.tests/unix/glib/glib.pro qtbase-opensource-src-5.5.1/config.tests/unix/glib/glib.pro --- qtbase-opensource-src-5.5.1-orig/config.tests/unix/glib/glib.pro 2015-10-12 23:35:35.000000000 -0500 +++ qtbase-opensource-src-5.5.1/config.tests/unix/glib/glib.pro 2015-12-13 17:02:56.000000000 -0600 @@ -1,2 +1,3 @@ SOURCES = glib.cpp CONFIG -= qt +LIBS += -lgthread-2.0 -lglib-2.0 diff -ruN qtbase-opensource-src-5.5.1-orig/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp qtbase-opensource-src-5.5.1/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp --- qtbase-opensource-src-5.5.1-orig/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2015-10-12 23:35:34.000000000 -0500 +++ qtbase-opensource-src-5.5.1/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp 2015-12-13 17:02:56.000000000 -0600 @@ -40,7 +40,7 @@ { iconv_t x = iconv_open("", ""); - const char *inp; + char *inp; char *outp; size_t inbytes, outbytes; iconv(x, &inp, &inbytes, &outp, &outbytes); diff -ruN qtbase-opensource-src-5.7.1-orig/config.tests/unix/icu/icu.pro qtbase-opensource-src-5.7.1/config.tests/unix/icu/icu.pro --- qtbase-opensource-src-5.7.1-orig/config.tests/unix/icu/icu.pro 2016-12-01 02:17:04.000000000 -0600 +++ qtbase-opensource-src-5.7.1/config.tests/unix/icu/icu.pro 2023-06-04 16:21:36.000000000 -0500 @@ -3,3 +3,4 @@ CONFIG -= qt dylib include($$PWD/../../../src/3rdparty/icu_dependency.pri) +QMAKE_CXXFLAGS += -std=c++11 diff -ruN qtbase-opensource-src-5.5.1-orig/mkspecs/common/gcc-base-mac.conf qtbase-opensource-src-5.5.1/mkspecs/common/gcc-base-mac.conf --- qtbase-opensource-src-5.5.1-orig/mkspecs/common/gcc-base-mac.conf 2015-10-12 23:35:32.000000000 -0500 +++ qtbase-opensource-src-5.5.1/mkspecs/common/gcc-base-mac.conf 2015-12-13 17:02:56.000000000 -0600 @@ -23,7 +23,7 @@ QMAKE_LFLAGS += -headerpad_max_install_names QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib -QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_PLUGIN += -bundle QMAKE_LFLAGS_INCREMENTAL += -undefined suppress -flat_namespace QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE} QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE} diff -ruN qtbase-opensource-src-5.5.1-orig/mkspecs/common/mac.conf qtbase-opensource-src-5.5.1/mkspecs/common/mac.conf --- qtbase-opensource-src-5.5.1-orig/mkspecs/common/mac.conf 2015-10-12 23:35:32.000000000 -0500 +++ qtbase-opensource-src-5.5.1/mkspecs/common/mac.conf 2015-12-13 17:02:56.000000000 -0600 @@ -8,6 +8,7 @@ QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib +QMAKE_EXTENSION_PLUGIN = so QMAKE_LIBDIR = # sdk.prf will prefix the proper SDK sysroot diff -ruN qtbase-opensource-src-5.5.1-orig/mkspecs/features/create_cmake.prf qtbase-opensource-src-5.5.1/mkspecs/features/create_cmake.prf --- qtbase-opensource-src-5.5.1-orig/mkspecs/features/create_cmake.prf 2015-10-12 23:35:32.000000000 -0500 +++ qtbase-opensource-src-5.5.1/mkspecs/features/create_cmake.prf 2015-12-13 17:02:56.000000000 -0600 @@ -147,7 +147,7 @@ } } else { mac { - isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so else: CMAKE_PlUGIN_EXT = .a CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} diff -ruN qtbase-opensource-src-5.6.0-orig/mkspecs/features/qt_module.prf qtbase-opensource-src-5.6.0/mkspecs/features/qt_module.prf --- qtbase-opensource-src-5.6.0-orig/mkspecs/features/qt_module.prf 2016-03-03 05:35:22.000000000 -0600 +++ qtbase-opensource-src-5.6.0/mkspecs/features/qt_module.prf 2016-03-18 22:01:07.000000000 -0500 @@ -245,7 +245,7 @@ load(qt_targets) # this builds on top of qt_common -!internal_module:!lib_bundle:if(unix|mingw) { +unix|mingw { CONFIG += create_pc QMAKE_PKGCONFIG_DESTDIR = pkgconfig host_build: \ diff -ruN qtbase-opensource-src-5.7.1-orig/mkspecs/macx-clang/qmake.conf qtbase-opensource-src-5.7.1/mkspecs/macx-clang/qmake.conf --- qtbase-opensource-src-5.7.1-orig/mkspecs/macx-clang/qmake.conf 2016-12-01 02:17:04.000000000 -0600 +++ qtbase-opensource-src-5.7.1/mkspecs/macx-clang/qmake.conf 2019-03-12 19:54:50.000000000 -0500 @@ -11,6 +11,6 @@ include(../common/clang.conf) include(../common/clang-mac.conf) -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 +QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@ load(qt_config) diff -ruN qtbase-opensource-src-5.7.1-orig/mkspecs/macx-g++/qmake.conf qtbase-opensource-src-5.7.1/mkspecs/macx-g++/qmake.conf --- qtbase-opensource-src-5.7.1-orig/mkspecs/macx-g++/qmake.conf 2016-12-01 02:17:04.000000000 -0600 +++ qtbase-opensource-src-5.7.1/mkspecs/macx-g++/qmake.conf 2019-03-12 19:55:15.000000000 -0500 @@ -14,6 +14,6 @@ include(../common/gcc-base-mac.conf) include(../common/g++-macx.conf) -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 +QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@ load(qt_config) diff -ruN qtbase-opensource-src-5.6.0-orig/src/platformsupport/fontdatabases/mac/coretext.pri qtbase-opensource-src-5.6.0/src/platformsupport/fontdatabases/mac/coretext.pri --- qtbase-opensource-src-5.6.0-orig/src/platformsupport/fontdatabases/mac/coretext.pri 2016-03-03 05:35:22.000000000 -0600 +++ qtbase-opensource-src-5.6.0/src/platformsupport/fontdatabases/mac/coretext.pri 2016-03-17 21:55:50.000000000 -0500 @@ -8,6 +8,12 @@ CONFIG += opentype } +contains(QT_CONFIG, system-freetype) { + HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h + SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp + CONFIG += opentype +} + ios: \ # On iOS CoreText and CoreGraphics are stand-alone frameworks LIBS_PRIVATE += -framework CoreText -framework CoreGraphics diff -ruN qtbase-opensource-src-5.6.0-orig/src/plugins/platforms/cocoa/cocoa.pro qtbase-opensource-src-5.6.0/src/plugins/platforms/cocoa/cocoa.pro --- qtbase-opensource-src-5.6.0-orig/src/plugins/platforms/cocoa/cocoa.pro 2016-03-03 05:35:22.000000000 -0600 +++ qtbase-opensource-src-5.6.0/src/plugins/platforms/cocoa/cocoa.pro 2016-03-17 21:55:06.000000000 -0500 @@ -86,6 +86,10 @@ LIBS += -framework Cocoa -framework Carbon -framework IOKit -lcups +contains(QT_CONFIG, system-freetype) { + LIBS += -lfreetype +} + QT += core-private gui-private platformsupport-private qtHaveModule(widgets) { --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm 2016-12-01 02:17:04.000000000 -0600 +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm 2017-10-21 18:48:44.000000000 -0500 @@ -650,15 +650,8 @@ return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height()); } -OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage) +void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage) { - // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev) - OSStatus err = noErr; - - require_action(inContext != NULL, InvalidContext, err = paramErr); - require_action(inBounds != NULL, InvalidBounds, err = paramErr); - require_action(inImage != NULL, InvalidImage, err = paramErr); - CGContextSaveGState( inContext ); CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds)); CGContextScaleCTM(inContext, 1, -1); @@ -666,10 +659,6 @@ CGContextDrawImage(inContext, *inBounds, inImage); CGContextRestoreGState(inContext); -InvalidImage: -InvalidBounds: -InvalidContext: - return err; } Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum) --- a/src/plugins/platforms/cocoa/qcocoahelpers.h 2017-10-21 18:50:51.000000000 -0500 +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h 2017-10-21 18:51:16.000000000 -0500 @@ -90,7 +90,7 @@ // Creates a mutable shape, it's the caller's responsibility to release. HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion ®ion); -OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage); +void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage); NSDragOperation qt_mac_mapDropAction(Qt::DropAction action); NSDragOperation qt_mac_mapDropActions(Qt::DropActions actions); diff -ruN qtbase-opensource-src-5.7.1-orig/src/corelib/global/qsystemdetection.h qtbase-opensource-src-5.7.1/src/corelib/global/qsystemdetection.h --- qtbase-opensource-src-5.7.1-orig/src/corelib/global/qsystemdetection.h 2016-12-01 02:17:04.000000000 -0600 +++ qtbase-opensource-src-5.7.1/src/corelib/global/qsystemdetection.h 2017-10-23 22:33:56.000000000 -0500 @@ -270,6 +270,12 @@ # if !defined(__MAC_10_12) # define __MAC_10_12 101200 # endif +# if !defined(__MAC_10_13) +# define __MAC_10_13 101300 +# endif +# if !defined(__MAC_10_14) +# define __MAC_10_14 101400 +# endif # if !defined(MAC_OS_X_VERSION_10_7) # define MAC_OS_X_VERSION_10_7 1070 # endif @@ -288,6 +294,12 @@ # if !defined(MAC_OS_X_VERSION_10_12) # define MAC_OS_X_VERSION_10_12 101200 # endif +# if !defined(MAC_OS_X_VERSION_10_13) +# define MAC_OS_X_VERSION_10_13 101300 +# endif +# if !defined(MAC_OS_X_VERSION_10_14) +# define MAC_OS_X_VERSION_10_14 101400 +# endif # # if !defined(__IPHONE_4_3) # define __IPHONE_4_3 40300 diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index 204d685..e05179e 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -886,7 +886,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl QFixed QCoreTextFontEngine::emSquareSize() const { - return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); + return QFixed(int(CTFontGetUnitsPerEm(ctfont))); } QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff -ruN qtbase-opensource-src-5.7.1-orig/src/network/access/access.pri qtbase-opensource-src-5.7.1/src/network/access/access.pri --- qtbase-opensource-src-5.7.1-orig/src/network/access/access.pri 2016-12-01 02:17:04.000000000 -0600 +++ qtbase-opensource-src-5.7.1/src/network/access/access.pri 2018-02-18 08:27:30.000000000 -0600 @@ -70,6 +70,10 @@ access/qhttpthreaddelegate.cpp \ access/qhttpmultipart.cpp +# logic copied from src/network/ssl/ssl.pri +contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { + QMAKE_CXXFLAGS += -I@FINK_PREFIX@/include +} mac: LIBS_PRIVATE += -framework Security include($$PWD/../../3rdparty/zlib_dependency.pri) From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 8 Nov 2019 11:30:40 +0100 Subject: Do not load plugin from the $PWD I see no reason why this would make sense to look for plugins in the current directory. And when there are plugins there, it may actually be wrong Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 Reviewed-by: Thiago Macieira --- src/corelib/plugin/qpluginloader.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index cadff4f32b..c2443dbdda 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName) paths.append(fileName.left(slash)); // don't include the '/' } else { paths = QCoreApplication::libraryPaths(); - paths.prepend(QStringLiteral(".")); // search in current dir first } for (const QString &path : qAsConst(paths)) { -- cgit v1.2.1