Change:
We are currently stuck on qt 5.11 on darwin/macOS. To get things consistent, this should update to qt 5.12 (or even 5.13) soon. Please run and paste the results.
If qt512 builds on darwin we should change the default version:
is currently broken:
Fixed in

Discussion:
_qt5_LinguistTools_check_file_exists(${imported_location}) set_target_properties(Qt5::lconvert PROPERTIES <ins> --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile(qmlImportScannerPath).exists()) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; +#ifdef NIXPKGS_QMLIMPORTSCANNER +    // Fallback: Nixpkgs hardcoded path +    if (!QFile(qmlImportScannerPath).exists()) +        qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; +#endif + // Verify that we found a qmlimportscanner binary if (!QFile(qmlImportScannerPath).exists()) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; </ins>

./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch ]; <ins> qttools = [ ./qttools.patch ]; </ins> }; mkDerivation =

!!ELSE set(imported_location "$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX") !!ENDIF <ins> diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index b14a494296..779c4eda95 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -211,7 +211,7 @@ private: // -------------------------------------------------------------------------- -#if !defined(QT_BOOTSTRAPPED) +#if 0 QT_END_NAMESPACE #include <os/activity.h> @@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); -#endif // !defined(QT_BOOTSTRAPPED) +#else // !defined(QT_BOOTSTRAPPED) + +#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) +#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) +#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) + +#define QT_APPLE_LOG_ACTIVITY2(...) +#define QT_APPLE_LOG_ACTIVITY1(...) +#define QT_APPLE_LOG_ACTIVITY(...) + +#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) + +#endif // ------------------------------------------------------------------------- diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp index 2c1005ad80..244147ea7d 100644 --- a/src/testlib/qappletestlogger.cpp +++ b/src/testlib/qappletestlogger.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -#if defined(QT_USE_APPLE_UNIFIED_LOGGING) +#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 using namespace QTestPrivate; diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 1268730cc6..a50e9b0764 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) #endif } -#if defined(QT_USE_APPLE_UNIFIED_LOGGING) +#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 // Logger that also feeds messages to AUL. It needs to wrap the existing // logger, as it needs to be able to short circuit the existing logger // in case AUL prints to stderr. </ins>

<ins> --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile(qmlImportScannerPath).exists()) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; +#ifdef NIXPKGS_QMLIMPORTSCANNER +    // Fallback: Nixpkgs hardcoded path +    if (!QFile(qmlImportScannerPath).exists()) +        qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; +#endif + // Verify that we found a qmlimportscanner binary if (!QFile(qmlImportScannerPath).exists()) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; </ins>

# TODO: move to buildInputs, this should not be propagated. AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL <del> darwin.libobjc libiconv </del> <ins> darwin.libobjc libiconv MetalKit </ins> ] else [

<del> { qtModule, stdenv, lib, qtbase }: </del> <ins> { qtModule, stdenv, lib, qtbase, qtdeclarative }: </ins> with lib;

"bin/macdeployqt" ]; <ins> NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; </ins> setupHook = ../hooks/qttools-setup-hook.sh; }

--replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage" ''; }); <ins> MetalKit = stdenv.lib.overrideDerivation super.MetalKit (drv: { installPhase = drv.installPhase + '' mkdir -p $out/include/simd cp ${lib.getDev sdk}/include/simd/*.h $out/include/simd/ ''; }); </ins> }; bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix {

MediaAccessibility      = [ CF CoreGraphics CoreText QuartzCore ]; MediaToolbox            = [ AudioToolbox AudioUnit CF CoreMedia ]; Metal                   = []; <ins> MetalKit                = [ ModelIO Metal ]; ModelIO                 = [ ]; </ins> NetFS                   = [ CF ]; OSAKit                  = [ Carbon ]; OpenAL                  = [];

libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); <del> # TODO bump to 5.12 on darwin once it's not broken qt5 = if stdenv.isDarwin then qt511 else qt512; </del> <ins> qt5 = qt512; </ins> libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };