···

       
12
       
12
       
 
       
 

     

       
13
       
13
       
 
       
 QMAKE_LFLAGS_REL_RPATH  =

     

       
14
       
14
       
 
       
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf

     

       
15
       
15
       
-
       
index bb5083c925..da8e2cb386 100644

     

       
15
       
15
       
+
       
index bb5083c925..77034f9bb6 100644

     

       
16
       
16
       
 
       
--- a/mkspecs/features/create_cmake.prf

     

       
17
       
17
       
 
       
+++ b/mkspecs/features/create_cmake.prf

     

       
18
       
18
       
 
       
@@ -21,7 +21,7 @@ load(cmake_functions)

     
···

       
48
       
48
       
 
       
-    # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}

     

       
49
       
49
       
 
       
-    CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"

     

       
50
       
50
       
 
       
-}

     

       
51
       
51
       
-
       
+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/

     

       
51
       
51
       
+
       
+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/

     

       
52
       
52
       
 
       
+CMAKE_LIB_DIR_IS_ABSOLUTE = True

     

       
53
       
53
       
 
       
 

     

       
54
       
54
       
 
       
-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])

     
···

       
77
       
77
       
 
       
-    CMAKE_DLL_DIR = $$CMAKE_LIB_DIR

     

       
78
       
78
       
 
       
-    CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE

     

       
79
       
79
       
 
       
-}

     

       
80
       
80
       
-
       
+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/

     

       
80
       
80
       
+
       
+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/

     

       
81
       
81
       
 
       
+CMAKE_DLL_DIR_IS_ABSOLUTE = True

     

       
82
       
82
       
 
       
 

     

       
83
       
83
       
 
       
 static|staticlib:CMAKE_STATIC_TYPE = true

     
···

       
432
       
432
       
 
       
-

     

       
433
       
433
       
 
       
-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()

     

       
434
       
434
       
 
       
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf

     

       
435
       
435
       
-
       
index 44636f2288..61ed486a76 100644

     

       
435
       
435
       
+
       
index 44636f2288..3b01424e67 100644

     

       
436
       
436
       
 
       
--- a/mkspecs/features/mac/default_pre.prf

     

       
437
       
437
       
 
       
+++ b/mkspecs/features/mac/default_pre.prf

     

       
438
       
438
       
-
       
@@ -1,56 +1,3 @@

     

       
438
       
438
       
+
       
@@ -1,56 +1,2 @@

     

       
439
       
439
       
 
       
 CONFIG = asset_catalogs rez $$CONFIG

     

       
440
       
440
       
 
       
 load(default_pre)

     

       
441
       
441
       
-
       
 

     

       
441
       
441
       
+
       
-

     

       
442
       
442
       
 
       
-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {

     

       
443
       
443
       
 
       
-    # Get path of Xcode's Developer directory

     

       
444
       
444
       
 
       
-    QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")

     
···

       
493
       
493
       
 
       
-# at build time, depending on the current Xcode SDK and configuration.

     

       
494
       
494
       
 
       
-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX

     

       
495
       
495
       
 
       
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf

     

       
496
       
496
       
-
       
index 3f6dc076ca..8b13789179 100644

     

       
496
       
496
       
+
       
index 3f6dc076ca..e69de29bb2 100644

     

       
497
       
497
       
 
       
--- a/mkspecs/features/mac/sdk.prf

     

       
498
       
498
       
 
       
+++ b/mkspecs/features/mac/sdk.prf

     

       
499
       
499
       
-
       
@@ -1,58 +1 @@

     

       
500
       
500
       
-
       
 

     

       
499
       
499
       
+
       
@@ -1,58 +0,0 @@

     

       
500
       
500
       
+
       
-

     

       
501
       
501
       
 
       
-isEmpty(QMAKE_MAC_SDK): \

     

       
502
       
502
       
 
       
-    error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")

     

       
503
       
503
       
 
       
-

     
···

       
676
       
676
       
 
       
     INSTALLS += inst_qch_docs

     

       
677
       
677
       
 
       
 

     

       
678
       
678
       
 
       
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf

     

       
679
       
679
       
-
       
index 668669e4cd..30f7fbac41 100644

     

       
679
       
679
       
+
       
index 668669e4cd..eb4840a0aa 100644

     

       
680
       
680
       
 
       
--- a/mkspecs/features/qt_example_installs.prf

     

       
681
       
681
       
 
       
+++ b/mkspecs/features/qt_example_installs.prf

     

       
682
       
682
       
-
       
@@ -77,13 +77,13 @@ for(extra, extras): \

     

       
683
       
683
       
-
       
 # Just for Qt Creator

     

       
684
       
684
       
-
       
 OTHER_FILES += $$sourcefiles

     

       
685
       
685
       
-
       
 

     

       
686
       
686
       
-
       
-sourcefiles += \

     

       
687
       
687
       
-
       
-    $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \

     

       
688
       
688
       
-
       
-    $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \

     

       
689
       
689
       
-
       
-    $$DBUS_ADAPTORS $$DBUS_INTERFACES

     

       
690
       
690
       
-
       
-addInstallFiles(sources.files, $$sourcefiles)

     

       
682
       
682
       
+
       
@@ -82,7 +82,7 @@ sourcefiles += \

     

       
683
       
683
       
+
       
     $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \

     

       
684
       
684
       
+
       
     $$DBUS_ADAPTORS $$DBUS_INTERFACES

     

       
685
       
685
       
+
       
 addInstallFiles(sources.files, $$sourcefiles)

     

       
691
       
686
       
 
       
-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase

     

       
692
       
692
       
-
       
-INSTALLS += sources

     

       
693
       
693
       
-
       
+    sourcefiles += \

     

       
694
       
694
       
-
       
+        $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \

     

       
695
       
695
       
-
       
+        $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \

     

       
696
       
696
       
-
       
+        $$DBUS_ADAPTORS $$DBUS_INTERFACES

     

       
697
       
697
       
-
       
+    addInstallFiles(sources.files, $$sourcefiles)

     

       
698
       
698
       
-
       
+    sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase

     

       
699
       
699
       
-
       
+    INSTALLS += sources

     

       
687
       
687
       
+
       
+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase

     

       
688
       
688
       
+
       
 INSTALLS += sources

     

       
700
       
689
       
 
       
 

     

       
701
       
690
       
 
       
 check_examples {

     

       
702
       
702
       
-
       
     srcfiles = $$sources.files

     

       
703
       
691
       
 
       
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf

     

       
704
       
692
       
 
       
index 1903e509c8..ae7b585989 100644

     

       
705
       
693
       
 
       
--- a/mkspecs/features/qt_functions.prf

     
···

       
952
       
940
       
 
       
 

     

       
953
       
941
       
 
       
     set_target_properties(Qt5::qdbusxml2cpp PROPERTIES

     

       
954
       
942
       
 
       
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
955
       
955
       
-
       
index 07869efd7d..37b95d1b6b 100644

     

       
943
       
943
       
+
       
index 07869efd7d..fb4183bada 100644

     

       
956
       
944
       
 
       
--- a/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
957
       
945
       
 
       
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
958
       
946
       
 
       
@@ -2,7 +2,7 @@

     
···

       
976
       
964
       
 
       
 

     

       
977
       
965
       
 
       
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       
978
       
966
       
 
       
-    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
979
       
979
       
-
       
+    set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
967
       
967
       
+
       
+    set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
980
       
968
       
 
       
 !!ELSE

     

       
981
       
969
       
 
       
     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
982
       
970
       
 
       
 !!ENDIF

     
···

       
1006
       
994
       
 
       
         if (!lib.load())

     

       
1007
       
995
       
 
       
             return false;

     

       
1008
       
996
       
 
       
     }

     

       
1009
       
1009
       
-
       
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       
1010
       
1010
       
-
       
index 341d3bccf2..3368234c26 100644

     

       
1011
       
1011
       
-
       
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       
1012
       
1012
       
-
       
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       
1013
       
1013
       
-
       
@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()

     

       
1014
       
1014
       
-
       
     QMacAutoReleasePool pool;

     

       
1015
       
1015
       
-
       
     userProfiles.clear();

     

       
1016
       
1016
       
-
       
 

     

       
1017
       
1017
       
-
       
-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1018
       
1018
       
-
       
+    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1019
       
1019
       
-
       
     for (NSString *ifName in wifiInterfaces) {

     

       
1020
       
1020
       
-
       
 

     

       
1021
       
1021
       
-
       
         CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];

     

       
1022
       
1022
       
-
       
@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()

     

       
1023
       
1023
       
-
       
 

     

       
1024
       
1024
       
-
       
     QMacAutoReleasePool pool;

     

       
1025
       
1025
       
-
       
 

     

       
1026
       
1026
       
-
       
-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1027
       
1027
       
-
       
+    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1028
       
1028
       
-
       
     for (NSString *ifName in wifiInterfaces) {

     

       
1029
       
1029
       
-
       
             scanThread->interfaceName = QString::fromNSString(ifName);

     

       
1030
       
1030
       
-
       
             scanThread->start();

     

       
1031
       
997
       
 
       
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp

     

       
1032
       
998
       
 
       
index b5a0a5bbeb..6c20305f4d 100644

     

       
1033
       
999
       
 
       
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp

     
···

       
1082
       
1048
       
 
       
             xcursorFound = xcursorLib.load();

     

       
1083
       
1049
       
 
       
         }

     

       
1084
       
1050
       
 
       
         if (xcursorFound) {

     

       
1085
       
1085
       
-
       
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm

     

       
1086
       
1086
       
-
       
index d1f19f2..1ac2cf1 100644

     

       
1087
       
1087
       
-
       
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm

     

       
1088
       
1088
       
-
       
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm

     

       
1089
       
1089
       
-
       
@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)

     

       
1090
       
1090
       
-
       


     

       
1091
       
1091
       
-
       
     if (!m_drawContentBorderGradient) {

     

       
1092
       
1092
       
-
       
         window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask;

     

       
1093
       
1093
       
-
       
-        [window.contentView.superview setNeedsDisplay:YES];

     

       
1094
       
1094
       
-
       
+        [[window.contentView superview] setNeedsDisplay:YES];

     

       
1095
       
1095
       
-
       
         window.titlebarAppearsTransparent = NO;

     

       
1096
       
1096
       
-
       
         return;

     

       
1097
       
1097
       
-
       
     }

     

       
1098
       
1098
       
-
       
diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm

     

       
1099
       
1099
       
-
       
index e846fa0..4171cd4 100644

     

       
1100
       
1100
       
-
       
--- a/src/plugins/platforms/cocoa/qnswindow.mm

     

       
1101
       
1101
       
-
       
+++ b/src/plugins/platforms/cocoa/qnswindow.mm

     

       
1102
       
1102
       
-
       
@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev)

     

       
1103
       
1103
       
-
       
     if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {

     

       
1104
       
1104
       
-
       
         NSPoint loc = [theEvent locationInWindow];

     

       
1105
       
1105
       
-
       
         NSRect windowFrame = [self convertRectFromScreen:self.frame];

     

       
1106
       
1106
       
-
       
-        NSRect contentFrame = self.contentView.frame;

     

       
1107
       
1107
       
-
       
+        NSRect contentFrame = [self.contentView frame];

     

       
1108
       
1108
       
-
       
         if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO))

     

       
1109
       
1109
       
-
       
             [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent];

     

       
1110
       
1110
       
-
       
     }

     

       
1111
       
1111
       
-
       
@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev)

     

       
1112
       
1112
       
-
       
 + (void)applicationActivationChanged:(NSNotification*)notification

     

       
1113
       
1113
       
-
       
 {

     

       
1114
       
1114
       
-
       
     const id sender = self;

     

       
1115
       
1115
       
-
       
-    NSEnumerator<NSWindow*> *windowEnumerator = nullptr;

     

       
1116
       
1116
       
-
       
+    NSEnumerator *windowEnumerator = nullptr;

     

       
1117
       
1117
       
-
       
     NSApplication *application = [NSApplication sharedApplication];

     

       
1118
       
1118
       
-
       


     

       
1119
       
1119
       
-
       
 #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)

     

       
1120
       
1051
       
 
       
diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp

     

       
1121
       
1052
       
 
       
index c4cd66c33b..b6f2691587 100644

     

       
1122
       
1053
       
 
       
--- a/src/plugins/platformthemes/gtk3/main.cpp

     
···

       
1153
       
1084
       
 
       
 

     

       
1154
       
1085
       
 
       
     return 0;

     

       
1155
       
1086
       
 
       
 }

     

       
1087
       
1087
       
+
       
diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h

     

       
1088
       
1088
       
+
       
index 6498ea84ef..d821ced7fc 100644

     

       
1089
       
1089
       
+
       
--- a/src/testlib/qtestassert.h

     

       
1090
       
1090
       
+
       
+++ b/src/testlib/qtestassert.h

     

       
1091
       
1091
       
+
       
@@ -44,10 +44,13 @@

     

       
1092
       
1092
       
+
       
 

     

       
1093
       
1093
       
+
       
 QT_BEGIN_NAMESPACE

     

       
1094
       
1094
       
+
       
 

     

       
1095
       
1095
       
+
       
-

     

       
1096
       
1096
       
+
       
+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)

     

       
1097
       
1097
       
+
       
+#define QTEST_ASSERT(cond) do { } while ((false) && (cond))

     

       
1098
       
1098
       
+
       
+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond))

     

       
1099
       
1099
       
+
       
+#else

     

       
1100
       
1100
       
+
       
 #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false)

     

       
1101
       
1101
       
+
       
-

     

       
1102
       
1102
       
+
       
 #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false)

     

       
1103
       
1103
       
+
       
+#endif

     

       
1104
       
1104
       
+
       
 

     

       
1105
       
1105
       
+
       
 QT_END_NAMESPACE

     

       
1106
       
1106
       
+
       
 

     

       
1156
       
1107
       
 
       
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       
1157
       
1108
       
 
       
index 99d87e2e46..a4eab2aa72 100644

     

       
1158
       
1109
       
 
       
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

···

       
1
       
1
       
 
       
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp

     

       
2
       
2
       
-
       
index ee5b38717..bbccef8c4 100644

     

       
2
       
2
       
+
       
index a7cafa1a9..e17ffd35b 100644

     

       
3
       
3
       
 
       
--- a/src/qml/qml/qqmlimport.cpp

     

       
4
       
4
       
 
       
+++ b/src/qml/qml/qqmlimport.cpp

     

       
5
       
5
       
-
       
@@ -1678,6 +1678,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)

     

       
5
       
5
       
+
       
@@ -1737,6 +1737,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)

     

       
6
       
6
       
 
       
     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);

     

       
7
       
7
       
 
       
     addImportPath(installImportsPath);

     

       
8
       
8
       
 
       
 

     
···

       
17
       
17
       
 
       
+

     

       
18
       
18
       
 
       
     // env import paths

     

       
19
       
19
       
 
       
     if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {

     

       
20
       
20
       
-
       
         const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");

     

       
20
       
20
       
+
       
         const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");

     

       
21
       
21
       
 
       
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf

     

       
22
       
22
       
 
       
index 330da358b..cdf570205 100644

     

       
23
       
23
       
 
       
--- a/tools/qmlcachegen/qmlcache.prf

     

···

       
1
       
1
       
 
       
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf

     

       
2
       
2
       
-
       
index 11fb52a0b1..a4cca1fdcb 100644

     

       
2
       
2
       
+
       
index 11fb52a0b1..614fdbb046 100644

     

       
3
       
3
       
 
       
--- a/mkspecs/features/create_cmake.prf

     

       
4
       
4
       
 
       
+++ b/mkspecs/features/create_cmake.prf

     

       
5
       
5
       
 
       
@@ -21,7 +21,7 @@ load(cmake_functions)

     
···

       
35
       
35
       
 
       
-    # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}

     

       
36
       
36
       
 
       
-    CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"

     

       
37
       
37
       
 
       
-}

     

       
38
       
38
       
-
       
+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/

     

       
38
       
38
       
+
       
+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/

     

       
39
       
39
       
 
       
+CMAKE_LIB_DIR_IS_ABSOLUTE = True

     

       
40
       
40
       
 
       
 

     

       
41
       
41
       
 
       
-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])

     
···

       
64
       
64
       
 
       
-    CMAKE_DLL_DIR = $$CMAKE_LIB_DIR

     

       
65
       
65
       
 
       
-    CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE

     

       
66
       
66
       
 
       
-}

     

       
67
       
67
       
-
       
+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/

     

       
67
       
67
       
+
       
+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/

     

       
68
       
68
       
 
       
+CMAKE_DLL_DIR_IS_ABSOLUTE = True

     

       
69
       
69
       
 
       
 

     

       
70
       
70
       
 
       
 static|staticlib:CMAKE_STATIC_TYPE = true

     
···

       
628
       
628
       
 
       
 

     

       
629
       
629
       
 
       
     set_target_properties(Qt5::qdbusxml2cpp PROPERTIES

     

       
630
       
630
       
 
       
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
631
       
631
       
-
       
index 07869efd7d..37b95d1b6b 100644

     

       
631
       
631
       
+
       
index 07869efd7d..fb4183bada 100644

     

       
632
       
632
       
 
       
--- a/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
633
       
633
       
 
       
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
634
       
634
       
 
       
@@ -2,7 +2,7 @@

     
···

       
652
       
652
       
 
       
 

     

       
653
       
653
       
 
       
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       
654
       
654
       
 
       
-    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
655
       
655
       
-
       
+    set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
655
       
655
       
+
       
+    set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
656
       
656
       
 
       
 !!ELSE

     

       
657
       
657
       
 
       
     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
658
       
658
       
 
       
 !!ENDIF

     
···

       
758
       
758
       
 
       
             xcursorFound = xcursorLib.load();

     

       
759
       
759
       
 
       
         }

     

       
760
       
760
       
 
       
         if (xcursorFound) {

     

       
761
       
761
       
+
       
diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h

     

       
762
       
762
       
+
       
index ca3e02ca06..28dd73d772 100644

     

       
763
       
763
       
+
       
--- a/src/testlib/qtestassert.h

     

       
764
       
764
       
+
       
+++ b/src/testlib/qtestassert.h

     

       
765
       
765
       
+
       
@@ -38,10 +38,13 @@

     

       
766
       
766
       
+
       
 

     

       
767
       
767
       
+
       
 QT_BEGIN_NAMESPACE

     

       
768
       
768
       
+
       
 

     

       
769
       
769
       
+
       
-

     

       
770
       
770
       
+
       
-#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (0)

     

       
771
       
771
       
+
       
-

     

       
772
       
772
       
+
       
-#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (0)

     

       
773
       
773
       
+
       
+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)

     

       
774
       
774
       
+
       
+#define QTEST_ASSERT(cond) do { } while ((false) && (cond))

     

       
775
       
775
       
+
       
+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond))

     

       
776
       
776
       
+
       
+#else

     

       
777
       
777
       
+
       
+#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false)

     

       
778
       
778
       
+
       
+#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false)

     

       
779
       
779
       
+
       
+#endif

     

       
780
       
780
       
+
       
 

     

       
781
       
781
       
+
       
 QT_END_NAMESPACE

     

       
782
       
782
       
+
       
 

     

       
761
       
783
       
 
       
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       
762
       
784
       
 
       
index 99d87e2e46..a4eab2aa72 100644

     

       
763
       
785
       
 
       
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

···

       
12
       
12
       
 
       
 

     

       
13
       
13
       
 
       
 QMAKE_LFLAGS_REL_RPATH  =

     

       
14
       
14
       
 
       
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf

     

       
15
       
15
       
-
       
index bb5083c925..da8e2cb386 100644

     

       
15
       
15
       
+
       
index bb5083c925..77034f9bb6 100644

     

       
16
       
16
       
 
       
--- a/mkspecs/features/create_cmake.prf

     

       
17
       
17
       
 
       
+++ b/mkspecs/features/create_cmake.prf

     

       
18
       
18
       
 
       
@@ -21,7 +21,7 @@ load(cmake_functions)

     
···

       
48
       
48
       
 
       
-    # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}

     

       
49
       
49
       
 
       
-    CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"

     

       
50
       
50
       
 
       
-}

     

       
51
       
51
       
-
       
+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/

     

       
51
       
51
       
+
       
+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/

     

       
52
       
52
       
 
       
+CMAKE_LIB_DIR_IS_ABSOLUTE = True

     

       
53
       
53
       
 
       
 

     

       
54
       
54
       
 
       
-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])

     
···

       
77
       
77
       
 
       
-    CMAKE_DLL_DIR = $$CMAKE_LIB_DIR

     

       
78
       
78
       
 
       
-    CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE

     

       
79
       
79
       
 
       
-}

     

       
80
       
80
       
-
       
+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/

     

       
80
       
80
       
+
       
+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/

     

       
81
       
81
       
 
       
+CMAKE_DLL_DIR_IS_ABSOLUTE = True

     

       
82
       
82
       
 
       
 

     

       
83
       
83
       
 
       
 static|staticlib:CMAKE_STATIC_TYPE = true

     
···

       
432
       
432
       
 
       
-

     

       
433
       
433
       
 
       
-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()

     

       
434
       
434
       
 
       
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf

     

       
435
       
435
       
-
       
index 44636f2288..61ed486a76 100644

     

       
435
       
435
       
+
       
index 44636f2288..3b01424e67 100644

     

       
436
       
436
       
 
       
--- a/mkspecs/features/mac/default_pre.prf

     

       
437
       
437
       
 
       
+++ b/mkspecs/features/mac/default_pre.prf

     

       
438
       
438
       
-
       
@@ -1,56 +1,3 @@

     

       
438
       
438
       
+
       
@@ -1,56 +1,2 @@

     

       
439
       
439
       
 
       
 CONFIG = asset_catalogs rez $$CONFIG

     

       
440
       
440
       
 
       
 load(default_pre)

     

       
441
       
441
       
-
       
 

     

       
441
       
441
       
+
       
-

     

       
442
       
442
       
 
       
-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {

     

       
443
       
443
       
 
       
-    # Get path of Xcode's Developer directory

     

       
444
       
444
       
 
       
-    QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")

     
···

       
493
       
493
       
 
       
-# at build time, depending on the current Xcode SDK and configuration.

     

       
494
       
494
       
 
       
-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX

     

       
495
       
495
       
 
       
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf

     

       
496
       
496
       
-
       
index 3f6dc076ca..8b13789179 100644

     

       
496
       
496
       
+
       
index 3f6dc076ca..e69de29bb2 100644

     

       
497
       
497
       
 
       
--- a/mkspecs/features/mac/sdk.prf

     

       
498
       
498
       
 
       
+++ b/mkspecs/features/mac/sdk.prf

     

       
499
       
499
       
-
       
@@ -1,58 +1 @@

     

       
500
       
500
       
-
       
 

     

       
499
       
499
       
+
       
@@ -1,58 +0,0 @@

     

       
500
       
500
       
+
       
-

     

       
501
       
501
       
 
       
-isEmpty(QMAKE_MAC_SDK): \

     

       
502
       
502
       
 
       
-    error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")

     

       
503
       
503
       
 
       
-

     
···

       
676
       
676
       
 
       
     INSTALLS += inst_qch_docs

     

       
677
       
677
       
 
       
 

     

       
678
       
678
       
 
       
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf

     

       
679
       
679
       
-
       
index 668669e4cd..30f7fbac41 100644

     

       
679
       
679
       
+
       
index 668669e4cd..eb4840a0aa 100644

     

       
680
       
680
       
 
       
--- a/mkspecs/features/qt_example_installs.prf

     

       
681
       
681
       
 
       
+++ b/mkspecs/features/qt_example_installs.prf

     

       
682
       
682
       
-
       
@@ -77,13 +77,13 @@ for(extra, extras): \

     

       
683
       
683
       
-
       
 # Just for Qt Creator

     

       
684
       
684
       
-
       
 OTHER_FILES += $$sourcefiles

     

       
685
       
685
       
-
       
 

     

       
686
       
686
       
-
       
-sourcefiles += \

     

       
687
       
687
       
-
       
-    $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \

     

       
688
       
688
       
-
       
-    $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \

     

       
689
       
689
       
-
       
-    $$DBUS_ADAPTORS $$DBUS_INTERFACES

     

       
690
       
690
       
-
       
-addInstallFiles(sources.files, $$sourcefiles)

     

       
682
       
682
       
+
       
@@ -82,7 +82,7 @@ sourcefiles += \

     

       
683
       
683
       
+
       
     $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \

     

       
684
       
684
       
+
       
     $$DBUS_ADAPTORS $$DBUS_INTERFACES

     

       
685
       
685
       
+
       
 addInstallFiles(sources.files, $$sourcefiles)

     

       
691
       
686
       
 
       
-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase

     

       
692
       
692
       
-
       
-INSTALLS += sources

     

       
693
       
693
       
-
       
+    sourcefiles += \

     

       
694
       
694
       
-
       
+        $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \

     

       
695
       
695
       
-
       
+        $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \

     

       
696
       
696
       
-
       
+        $$DBUS_ADAPTORS $$DBUS_INTERFACES

     

       
697
       
697
       
-
       
+    addInstallFiles(sources.files, $$sourcefiles)

     

       
698
       
698
       
-
       
+    sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase

     

       
699
       
699
       
-
       
+    INSTALLS += sources

     

       
687
       
687
       
+
       
+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase

     

       
688
       
688
       
+
       
 INSTALLS += sources

     

       
700
       
689
       
 
       
 

     

       
701
       
690
       
 
       
 check_examples {

     

       
702
       
702
       
-
       
     srcfiles = $$sources.files

     

       
703
       
691
       
 
       
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf

     

       
704
       
692
       
 
       
index 1903e509c8..ae7b585989 100644

     

       
705
       
693
       
 
       
--- a/mkspecs/features/qt_functions.prf

     
···

       
952
       
940
       
 
       
 

     

       
953
       
941
       
 
       
     set_target_properties(Qt5::qdbusxml2cpp PROPERTIES

     

       
954
       
942
       
 
       
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
955
       
955
       
-
       
index 07869efd7d..37b95d1b6b 100644

     

       
943
       
943
       
+
       
index 07869efd7d..fb4183bada 100644

     

       
956
       
944
       
 
       
--- a/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
957
       
945
       
 
       
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in

     

       
958
       
946
       
 
       
@@ -2,7 +2,7 @@

     
···

       
976
       
964
       
 
       
 

     

       
977
       
965
       
 
       
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       
978
       
966
       
 
       
-    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
979
       
979
       
-
       
+    set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
967
       
967
       
+
       
+    set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
980
       
968
       
 
       
 !!ELSE

     

       
981
       
969
       
 
       
     set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       
982
       
970
       
 
       
 !!ENDIF

     
···

       
1028
       
1016
       
 
       
         {

     

       
1029
       
1017
       
 
       
             // specific curves requested, but not possible to set -> error

     

       
1030
       
1018
       
 
       
             sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));

     

       
1031
       
1031
       
-
       
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       
1032
       
1032
       
-
       
index 341d3bccf2..3368234c26 100644

     

       
1033
       
1033
       
-
       
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       
1034
       
1034
       
-
       
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm

     

       
1035
       
1035
       
-
       
@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()

     

       
1036
       
1036
       
-
       
     QMacAutoReleasePool pool;

     

       
1037
       
1037
       
-
       
     userProfiles.clear();

     

       
1038
       
1038
       
-
       
 

     

       
1039
       
1039
       
-
       
-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1040
       
1040
       
-
       
+    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1041
       
1041
       
-
       
     for (NSString *ifName in wifiInterfaces) {

     

       
1042
       
1042
       
-
       
 

     

       
1043
       
1043
       
-
       
         CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];

     

       
1044
       
1044
       
-
       
@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()

     

       
1045
       
1045
       
-
       
 

     

       
1046
       
1046
       
-
       
     QMacAutoReleasePool pool;

     

       
1047
       
1047
       
-
       
 

     

       
1048
       
1048
       
-
       
-    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1049
       
1049
       
-
       
+    NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];

     

       
1050
       
1050
       
-
       
     for (NSString *ifName in wifiInterfaces) {

     

       
1051
       
1051
       
-
       
             scanThread->interfaceName = QString::fromNSString(ifName);

     

       
1052
       
1052
       
-
       
             scanThread->start();

     

       
1053
       
1019
       
 
       
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp

     

       
1054
       
1020
       
 
       
index b5a0a5bbeb..6c20305f4d 100644

     

       
1055
       
1021
       
 
       
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp

     
···

       
1068
       
1034
       
 
       
 }

     

       
1069
       
1035
       
 
       
 

     

       
1070
       
1036
       
 
       
 QString TableGenerator::findComposeFile()

     

       
1071
       
1071
       
-
       
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm

     

       
1072
       
1072
       
-
       
index 5cd4beb4f0..84919e6d6a 100644

     

       
1073
       
1073
       
-
       
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm

     

       
1074
       
1074
       
-
       
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm

     

       
1075
       
1075
       
-
       
@@ -320,7 +320,7 @@ static void qt_closePopups()

     

       
1076
       
1076
       
-
       
 + (void)applicationActivationChanged:(NSNotification*)notification

     

       
1077
       
1077
       
-
       
 {

     

       
1078
       
1078
       
-
       
     const id sender = self;

     

       
1079
       
1079
       
-
       
-    NSEnumerator<NSWindow*> *windowEnumerator = nullptr;

     

       
1080
       
1080
       
-
       
+    NSEnumerator *windowEnumerator = nullptr;

     

       
1081
       
1081
       
-
       
     NSApplication *application = [NSApplication sharedApplication];

     

       
1082
       
1082
       
-
       
 

     

       
1083
       
1083
       
-
       
 #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)

     

       
1084
       
1037
       
 
       
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp

     

       
1085
       
1038
       
 
       
index e2e573f0e1..1c8289f81e 100644

     

       
1086
       
1039
       
 
       
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp

     
···

       
1153
       
1106
       
 
       
 

     

       
1154
       
1107
       
 
       
     return 0;

     

       
1155
       
1108
       
 
       
 }

     

       
1109
       
1109
       
+
       
diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h

     

       
1110
       
1110
       
+
       
index 6498ea84ef..d821ced7fc 100644

     

       
1111
       
1111
       
+
       
--- a/src/testlib/qtestassert.h

     

       
1112
       
1112
       
+
       
+++ b/src/testlib/qtestassert.h

     

       
1113
       
1113
       
+
       
@@ -44,10 +44,13 @@

     

       
1114
       
1114
       
+
       
 

     

       
1115
       
1115
       
+
       
 QT_BEGIN_NAMESPACE

     

       
1116
       
1116
       
+
       
 

     

       
1117
       
1117
       
+
       
-

     

       
1118
       
1118
       
+
       
+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)

     

       
1119
       
1119
       
+
       
+#define QTEST_ASSERT(cond) do { } while ((false) && (cond))

     

       
1120
       
1120
       
+
       
+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond))

     

       
1121
       
1121
       
+
       
+#else

     

       
1122
       
1122
       
+
       
 #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false)

     

       
1123
       
1123
       
+
       
-

     

       
1124
       
1124
       
+
       
 #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false)

     

       
1125
       
1125
       
+
       
+#endif

     

       
1126
       
1126
       
+
       
 

     

       
1127
       
1127
       
+
       
 QT_END_NAMESPACE

     

       
1128
       
1128
       
+
       
 

     

       
1156
       
1129
       
 
       
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       
1157
       
1130
       
 
       
index 99d87e2e46..a4eab2aa72 100644

     

       
1158
       
1131
       
 
       
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

···

       
15
       
15
       
 
       
            if grep -q '\$\$QT_MODULE_' "${pr:?}"; then

     

       
16
       
16
       
 
       
                echo "fixQtModulePaths: Fixing module paths in \`${pr:?}'..."

     

       
17
       
17
       
 
       
                sed -i "${pr:?}" \

     

       
18
       
18
       
-
       
                    -e "s|\\\$\\\$QT_MODULE_LIB_BASE|$dev/lib|g" \

     

       
19
       
19
       
-
       
                    -e "s|\\\$\\\$QT_MODULE_HOST_LIB_BASE|$dev/lib|g" \

     

       
18
       
18
       
+
       
                    -e "s|\\\$\\\$QT_MODULE_LIB_BASE|$lib/lib|g" \

     

       
19
       
19
       
+
       
                    -e "s|\\\$\\\$QT_MODULE_HOST_LIB_BASE|$lib/lib|g" \

     

       
20
       
20
       
 
       
                    -e "s|\\\$\\\$QT_MODULE_INCLUDE_BASE|$dev/include|g" \

     

       
21
       
21
       
 
       
                    -e "s|\\\$\\\$QT_MODULE_BIN_BASE|$dev/bin|g"

     

       
22
       
22
       
 
       
            fi

     
···

       
25
       
25
       
 
       
        echo "fixQtModulePaths: Warning: \`$dir' is not a directory"

     

       
26
       
26
       
 
       
    else

     

       
27
       
27
       
 
       
        echo "fixQtModulePaths: Warning: \`$dir' does not exist"

     

       
28
       
28
       
-
       
    fi

     

       
29
       
29
       
-
       


     

       
30
       
30
       
-
       
    if [ "z$dev" != "z$lib" ]; then

     

       
31
       
31
       
-
       
        if [ -d "$lib/lib" ]; then

     

       
32
       
32
       
-
       
            mkdir -p "$dev/lib"

     

       
33
       
33
       
-
       
            lndir -silent "$lib/lib" "$dev/lib"

     

       
34
       
34
       
-
       
        fi

     

       
35
       
28
       
 
       
    fi

     

       
36
       
29
       
 
       


     

       
37
       
30
       
 
       
    if [ "z$bin" != "z$dev" ]; then

     

···

       
1
       
1
       
-
       
# fixQtStaticLibs

     

       
2
       
2
       
-
       
#

     

       
3
       
3
       
-
       
# Usage: fixQtStaticLibs _lib_ _dev_

     

       
4
       
4
       
-
       
#

     

       
5
       
5
       
-
       
# Find static Qt libraries in output _lib_ and move them to the corresponding

     

       
6
       
6
       
-
       
# path in output _dev_. Any QMake library definitions (*.prl files) are also

     

       
7
       
7
       
-
       
# moved and library paths are patched.

     

       
8
       
8
       
-
       
#

     

       
9
       
9
       
-
       
fixQtStaticLibs() {

     

       
10
       
10
       
-
       
    local lib="$1"

     

       
11
       
11
       
-
       
    local dev="$2"

     

       
12
       
12
       
-
       


     

       
13
       
13
       
-
       
    pushd "$lib"

     

       
14
       
14
       
-
       
    if [ -d "lib" ]; then

     

       
15
       
15
       
-
       
        find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \

     

       
16
       
16
       
-
       
            while read -r -d $'\0' file; do

     

       
17
       
17
       
-
       
                mkdir -p "$dev/$(dirname "$file")"

     

       
18
       
18
       
-
       
                mv "$lib/$file" "$dev/$file"

     

       
19
       
19
       
-
       
            done

     

       
20
       
20
       
-
       
    fi

     

       
21
       
21
       
-
       
    popd

     

       
22
       
22
       
-
       


     

       
23
       
23
       
-
       
    if [ -d "$dev" ]; then

     

       
24
       
24
       
-
       
        find "$dev" -name '*.prl' | while read prl; do

     

       
25
       
25
       
-
       
            echo "fixQtStaticLibs: Fixing built-in paths in \`$prl'..."

     

       
26
       
26
       
-
       
            sed -i "$prl" \

     

       
27
       
27
       
-
       
                -e '/^QMAKE_PRL_BUILD_DIR =/d' \

     

       
28
       
28
       
-
       
                -e '/^QMAKE_PRO_INPUT =/d' \

     

       
29
       
29
       
-
       
                -e "s|-L\\\$\\\$NIX_OUTPUT_OUT/lib|-L$lib/lib -L$dev/lib|g"

     

       
30
       
30
       
-
       
        done

     

       
31
       
31
       
-
       
    fi

     

       
32
       
32
       
-
       
}

     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
. @fix_qt_builtin_paths@

     

       
6
       
6
       
 
       
. @fix_qt_module_paths@

     

       
7
       
7
       
-
       
. @fix_qt_static_libs@

     

       
8
       
7
       
 
       


     

       
9
       
8
       
 
       
providesQtRuntime() {

     

       
10
       
9
       
 
       
    [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ]

     
···

       
63
       
62
       
 
       
if [ -z "$dontPatchMkspecs" ]; then

     

       
64
       
63
       
 
       
    postPhases="${postPhases}${postPhases:+ }postPatchMkspecs"

     

       
65
       
64
       
 
       
fi

     

       
66
       
66
       
-
       


     

       
67
       
67
       
-
       
postMoveQtStaticLibs() {

     

       
68
       
68
       
-
       
    if [ "z${!outputLib}" != "z${!outputDev}" ]; then

     

       
69
       
69
       
-
       
        fixQtStaticLibs "${!outputLib}" "${!outputDev}"

     

       
70
       
70
       
-
       
    fi

     

       
71
       
71
       
-
       
}

     

       
72
       
72
       
-
       
if [ -z "$dontMoveQtStaticLibs" ]; then

     

       
73
       
73
       
-
       
    postPhases="${postPhases}${postPhases:+ }postMoveQtStaticLibs"

     

       
74
       
74
       
-
       
fi

     

···

       
14
       
14
       
 
       
      ++ optional (debug != null)

     

       
15
       
15
       
 
       
          (if debug then "CONFIG+=debug" else "CONFIG+=release");

     

       
16
       
16
       
 
       


     

       
17
       
17
       
+
       
    NIX_CFLAGS_COMPILE = optional (debug != null) "-DQT_NO_DEBUG";

     

       
18
       
18
       
+
       


     

       
17
       
19
       
 
       
    cmakeFlags =

     

       
18
       
20
       
 
       
      (args.cmakeFlags or [])

     

       
19
       
21
       
 
       
      ++ [ "-DBUILD_TESTING=OFF" ]

     

···

       
97
       
97
       
 
       
  fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;

     

       
98
       
98
       
 
       
  fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh;

     

       
99
       
99
       
 
       
  preHook = ''

     

       
100
       
100
       
-
       
    . "$fix_qt_static_libs"

     

       
101
       
100
       
 
       
    . "$fix_qt_builtin_paths"

     

       
102
       
101
       
 
       
    . "$fix_qt_module_paths"

     

       
103
       
102
       
 
       
    . ${../hooks/move-qt-dev-tools.sh}

     
···

       
361
       
360
       
 
       
    + ''

     

       
362
       
361
       
 
       
      fixQtModulePaths "''${!outputDev}/mkspecs/modules"

     

       
363
       
362
       
 
       
      fixQtBuiltinPaths "''${!outputDev}" '*.pr?'

     

       
364
       
364
       
-
       
    ''

     

       
365
       
365
       
-
       


     

       
366
       
366
       
-
       
    # Move static libraries and QMake library definitions into $dev.

     

       
367
       
367
       
-
       
    + ''

     

       
368
       
368
       
-
       
      fixQtStaticLibs "''${!outputLib}" "''${!outputDev}"

     

       
369
       
363
       
 
       
    ''

     

       
370
       
364
       
 
       


     

       
371
       
365
       
 
       
    # Move development tools to $dev