commit e5b1a5724e22bbe09966c62c33ed5822268b911d · pyrox.dev/nixpkgs

+1 -1

maintainers/scripts/fetch-kde-qt.sh

···

       21
       21
        
           # Sanitize file name

     

       22
       22
        
           filename=$(basename "$src" | tr '@' '_')

     

       23
       23
        
           nameVersion="${filename%.tar.*}"

     

       24
       24
       -
           name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')

     

       24
       24
       +
           name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,')

     

       25
       25
        
           version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')

     

       26
       26
        
           echo "$name,$version,$src,$filename" >>$csv

     

       27
       27
        
       done

+124

pkgs/development/libraries/qt-5/5.10/default.nix

···

       1
       1
       +
       /*

     

       2
       2
       +
       

     

       3
       3
       +
       # Updates

     

       4
       4
       +
       

     

       5
       5
       +
       Before a major version update, make a copy of this directory. (We like to

     

       6
       6
       +
       keep the old version around for a short time after major updates.) Add a

     

       7
       7
       +
       top-level attribute to `top-level/all-packages.nix`.

     

       8
       8
       +
       

     

       9
       9
       +
       1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.

     

       10
       10
       +
       2. From the top of the Nixpkgs tree, run

     

       11
       11
       +
          `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.

     

       12
       12
       +
       3. Update `qtCompatVersion` below if the minor version number changes.

     

       13
       13
       +
       4. Check that the new packages build correctly.

     

       14
       14
       +
       5. Commit the changes and open a pull request.

     

       15
       15
       +
       

     

       16
       16
       +
       */

     

       17
       17
       +
       

     

       18
       18
       +
       {

     

       19
       19
       +
         newScope,

     

       20
       20
       +
         stdenv, fetchurl, makeSetupHook, makeWrapper,

     

       21
       21
       +
         bison, cups ? null, harfbuzz, mesa, perl,

     

       22
       22
       +
         gstreamer, gst-plugins-base, gtk3, dconf,

     

       23
       23
       +
       

     

       24
       24
       +
         # options

     

       25
       25
       +
         developerBuild ? false,

     

       26
       26
       +
         decryptSslTraffic ? false,

     

       27
       27
       +
         debug ? null,

     

       28
       28
       +
       }:

     

       29
       29
       +
       

     

       30
       30
       +
       with stdenv.lib;

     

       31
       31
       +
       

     

       32
       32
       +
       let

     

       33
       33
       +
       

     

       34
       34
       +
         qtCompatVersion = "5.10";

     

       35
       35
       +
       

     

       36
       36
       +
         mirror = "http://download.qt.io";

     

       37
       37
       +
         srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };

     

       38
       38
       +
       

     

       39
       39
       +
         patches = {

     

       40
       40
       +
           qtbase = [ ./qtbase.patch ];

     

       41
       41
       +
           qtdeclarative = [ ./qtdeclarative.patch ];

     

       42
       42
       +
           qtscript = [ ./qtscript.patch ];

     

       43
       43
       +
           qtserialport = [ ./qtserialport.patch ];

     

       44
       44
       +
           qttools = [ ./qttools.patch ];

     

       45
       45
       +
           qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;

     

       46
       46
       +
           qtwebkit = [ ./qtwebkit.patch ];

     

       47
       47
       +
         };

     

       48
       48
       +
       

     

       49
       49
       +
         mkDerivation =

     

       50
       50
       +
           import ../mkDerivation.nix

     

       51
       51
       +
           { inherit stdenv; inherit (stdenv) lib; }

     

       52
       52
       +
           { inherit debug; };

     

       53
       53
       +
       

     

       54
       54
       +
         qtModule =

     

       55
       55
       +
           import ../qtModule.nix

     

       56
       56
       +
           { inherit mkDerivation perl; inherit (stdenv) lib; }

     

       57
       57
       +
           { inherit self srcs patches; };

     

       58
       58
       +
       

     

       59
       59
       +
         addPackages = self: with self;

     

       60
       60
       +
           let

     

       61
       61
       +
             callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };

     

       62
       62
       +
           in {

     

       63
       63
       +
       

     

       64
       64
       +
             inherit mkDerivation;

     

       65
       65
       +
       

     

       66
       66
       +
             qtbase = callPackage ../modules/qtbase.nix {

     

       67
       67
       +
               inherit (srcs.qtbase) src version;

     

       68
       68
       +
               patches = patches.qtbase;

     

       69
       69
       +
               inherit bison cups harfbuzz mesa;

     

       70
       70
       +
               withGtk3 = true; inherit dconf gtk3;

     

       71
       71
       +
               inherit developerBuild decryptSslTraffic;

     

       72
       72
       +
             };

     

       73
       73
       +
       

     

       74
       74
       +
             qtcharts = callPackage ../modules/qtcharts.nix {};

     

       75
       75
       +
             qtconnectivity = callPackage ../modules/qtconnectivity.nix {};

     

       76
       76
       +
             qtdeclarative = callPackage ../modules/qtdeclarative.nix {};

     

       77
       77
       +
             qtdoc = callPackage ../modules/qtdoc.nix {};

     

       78
       78
       +
             qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

     

       79
       79
       +
             qtimageformats = callPackage ../modules/qtimageformats.nix {};

     

       80
       80
       +
             qtlocation = callPackage ../modules/qtlocation.nix {};

     

       81
       81
       +
             qtmacextras = callPackage ../modules/qtmacextras.nix {};

     

       82
       82
       +
             qtmultimedia = callPackage ../modules/qtmultimedia.nix {

     

       83
       83
       +
               inherit gstreamer gst-plugins-base;

     

       84
       84
       +
             };

     

       85
       85
       +
             qtquick1 = null;

     

       86
       86
       +
             qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};

     

       87
       87
       +
             qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};

     

       88
       88
       +
             qtscript = callPackage ../modules/qtscript.nix {};

     

       89
       89
       +
             qtsensors = callPackage ../modules/qtsensors.nix {};

     

       90
       90
       +
             qtserialport = callPackage ../modules/qtserialport.nix {};

     

       91
       91
       +
             qtsvg = callPackage ../modules/qtsvg.nix {};

     

       92
       92
       +
             qttools = callPackage ../modules/qttools.nix {};

     

       93
       93
       +
             qttranslations = callPackage ../modules/qttranslations.nix {};

     

       94
       94
       +
             qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};

     

       95
       95
       +
             qtwayland = callPackage ../modules/qtwayland.nix {};

     

       96
       96
       +
             qtwebchannel = callPackage ../modules/qtwebchannel.nix {};

     

       97
       97
       +
             qtwebengine = callPackage ../modules/qtwebengine.nix {};

     

       98
       98
       +
             qtwebkit = callPackage ../modules/qtwebkit.nix {};

     

       99
       99
       +
             qtwebsockets = callPackage ../modules/qtwebsockets.nix {};

     

       100
       100
       +
             qtx11extras = callPackage ../modules/qtx11extras.nix {};

     

       101
       101
       +
             qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};

     

       102
       102
       +
       

     

       103
       103
       +
             env = callPackage ../qt-env.nix {};

     

       104
       104
       +
             full = env "qt-${qtbase.version}" ([

     

       105
       105
       +
               qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects

     

       106
       106
       +
               qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript

     

       107
       107
       +
               qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets

     

       108
       108
       +
               qtx11extras qtxmlpatterns

     

       109
       109
       +
             ] ++ optional (!stdenv.isDarwin) qtwayland

     

       110
       110
       +
               ++ optional (stdenv.isDarwin) qtmacextras);

     

       111
       111
       +
       

     

       112
       112
       +
             qmake = makeSetupHook {

     

       113
       113
       +
               deps = [ self.qtbase.dev ];

     

       114
       114
       +
               substitutions = {

     

       115
       115
       +
                 inherit (stdenv) isDarwin;

     

       116
       116
       +
                 qtbase_dev = self.qtbase.dev;

     

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

     

       118
       118
       +
               };

     

       119
       119
       +
             } ../hooks/qmake-hook.sh;

     

       120
       120
       +
           };

     

       121
       121
       +
       

     

       122
       122
       +
          self = makeScope newScope addPackages;

     

       123
       123
       +
       

     

       124
       124
       +
       in self

pkgs/development/libraries/qt-5/5.10/fetch.sh

···

       1
       1
       +
       WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/ \

     

       2
       2
       +
                   -A '*.tar.xz' )

+1133

pkgs/development/libraries/qt-5/5.10/qtbase.patch

···

       1
       1
       +
       diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf

     

       2
       2
       +
       index 5208379f9a..92fe29a0ac 100644

     

       3
       3
       +
       --- a/mkspecs/common/mac.conf

     

       4
       4
       +
       +++ b/mkspecs/common/mac.conf

     

       5
       5
       +
       @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL     = \

     

       6
       6
       +
        

     

       7
       7
       +
        QMAKE_FIX_RPATH         = install_name_tool -id

     

       8
       8
       +
        

     

       9
       9
       +
       -QMAKE_LFLAGS_RPATH      = -Wl,-rpath,

     

       10
       10
       +
       +QMAKE_LFLAGS_RPATH      =

     

       11
       11
       +
        QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip

     

       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

     

       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)

     

       19
       19
       +
        # at cmake time whether package has been found via a symlink, and correct

     

       20
       20
       +
        # that to an absolute path. This is only done for installations to

     

       21
       21
       +
        # the /usr or / prefix.

     

       22
       22
       +
       -CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS])

     

       23
       23
       +
       +CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/)

     

       24
       24
       +
        contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR

     

       25
       25
       +
        

     

       26
       26
       +
        CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake

     

       27
       27
       +
       @@ -47,47 +47,22 @@ split_incpath {

     

       28
       28
       +
                $$cmake_extra_source_includes.output

     

       29
       29
       +
        }

     

       30
       30
       +
        

     

       31
       31
       +
       -CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])

     

       32
       32
       +
       -contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") {

     

       33
       33
       +
       -    CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/

     

       34
       34
       +
       -    CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True

     

       35
       35
       +
       -}

     

       36
       36
       +
       +CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/

     

       37
       37
       +
       +CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True

     

       38
       38
       +
        

     

       39
       39
       +
        !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true

     

       40
       40
       +
        

     

       41
       41
       +
       -CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])

     

       42
       42
       +
       -contains(CMAKE_LIB_DIR,"^\\.\\./.*") {

     

       43
       43
       +
       -    CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/

     

       44
       44
       +
       -    CMAKE_LIB_DIR_IS_ABSOLUTE = True

     

       45
       45
       +
       -} else {

     

       46
       46
       +
       -    CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])

     

       47
       47
       +
       -    # We need to go up another two levels because the CMake files are

     

       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/

     

       52
       52
       +
       +CMAKE_LIB_DIR_IS_ABSOLUTE = True

     

       53
       53
       +
        

     

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

     

       55
       55
       +
       -contains(CMAKE_BIN_DIR, "^\\.\\./.*") {

     

       56
       56
       +
       -    CMAKE_BIN_DIR = $$[QT_HOST_BINS]/

     

       57
       57
       +
       -    CMAKE_BIN_DIR_IS_ABSOLUTE = True

     

       58
       58
       +
       -}

     

       59
       59
       +
       +CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/

     

       60
       60
       +
       +CMAKE_BIN_DIR_IS_ABSOLUTE = True

     

       61
       61
       +
        

     

       62
       62
       +
       -CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX])

     

       63
       63
       +
       -contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") {

     

       64
       64
       +
       -    CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/

     

       65
       65
       +
       -    CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True

     

       66
       66
       +
       -}

     

       67
       67
       +
       +CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/

     

       68
       68
       +
       +CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True

     

       69
       69
       +
        

     

       70
       70
       +
       -win32:!static:!staticlib {

     

       71
       71
       +
       -    CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX])

     

       72
       72
       +
       -    contains(CMAKE_DLL_DIR, "^\\.\\./.*") {

     

       73
       73
       +
       -        CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/

     

       74
       74
       +
       -        CMAKE_DLL_DIR_IS_ABSOLUTE = True

     

       75
       75
       +
       -    }

     

       76
       76
       +
       -} else {

     

       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/

     

       81
       81
       +
       +CMAKE_DLL_DIR_IS_ABSOLUTE = True

     

       82
       82
       +
        

     

       83
       83
       +
        static|staticlib:CMAKE_STATIC_TYPE = true

     

       84
       84
       +
        

     

       85
       85
       +
       @@ -167,7 +142,7 @@ contains(CONFIG, plugin) {

     

       86
       86
       +
              cmake_target_file

     

       87
       87
       +
        

     

       88
       88
       +
            cmake_qt5_plugin_file.files = $$cmake_target_file.output

     

       89
       89
       +
       -    cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}

     

       90
       90
       +
       +    cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME}

     

       91
       91
       +
            INSTALLS += cmake_qt5_plugin_file

     

       92
       92
       +
        

     

       93
       93
       +
            return()

     

       94
       94
       +
       @@ -314,7 +289,7 @@ exists($$cmake_macros_file.input) {

     

       95
       95
       +
            cmake_qt5_module_files.files += $$cmake_macros_file.output

     

       96
       96
       +
        }

     

       97
       97
       +
        

     

       98
       98
       +
       -cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}

     

       99
       99
       +
       +cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME}

     

       100
       100
       +
        

     

       101
       101
       +
        # We are generating cmake files. Most developers of Qt are not aware of cmake,

     

       102
       102
       +
        # so we require automatic tests to be available. The only module which should

     

       103
       103
       +
       diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       104
       104
       +
       index 55c74aad66..0bbc8718eb 100644

     

       105
       105
       +
       --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       106
       106
       +
       +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       107
       107
       +
       @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)

     

       108
       108
       +
        endif()

     

       109
       109
       +
        !!ENDIF

     

       110
       110
       +
        

     

       111
       111
       +
       -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)

     

       112
       112
       +
       -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       113
       113
       +
       -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")

     

       114
       114
       +
       -!!ELSE

     

       115
       115
       +
       -get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)

     

       116
       116
       +
       -# Use original install prefix when loaded through a

     

       117
       117
       +
       -# cross-prefix symbolic link such as /lib -> /usr/lib.

     

       118
       118
       +
       -get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)

     

       119
       119
       +
       -get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)

     

       120
       120
       +
       -if(_realCurr STREQUAL _realOrig)

     

       121
       121
       +
       -    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)

     

       122
       122
       +
       -else()

     

       123
       123
       +
       -    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)

     

       124
       124
       +
       -endif()

     

       125
       125
       +
       -unset(_realOrig)

     

       126
       126
       +
       -unset(_realCurr)

     

       127
       127
       +
       -unset(_IMPORT_PREFIX)

     

       128
       128
       +
       -!!ENDIF

     

       129
       129
       +
       -!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       130
       130
       +
       -get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)

     

       131
       131
       +
       -!!ELSE

     

       132
       132
       +
       -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")

     

       133
       133
       +
       -!!ENDIF

     

       134
       134
       +
       -

     

       135
       135
       +
        !!IF !equals(TEMPLATE, aux)

     

       136
       136
       +
        # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.

     

       137
       137
       +
        set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")

     

       138
       138
       +
       @@ -58,11 +34,7 @@ endmacro()

     

       139
       139
       +
        macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)

     

       140
       140
       +
            set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       141
       141
       +
        

     

       142
       142
       +
       -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)

     

       143
       143
       +
       -    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")

     

       144
       144
       +
       -!!ELSE

     

       145
       145
       +
            set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")

     

       146
       146
       +
       -!!ENDIF

     

       147
       147
       +
            _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})

     

       148
       148
       +
            set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES

     

       149
       149
       +
                \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"

     

       150
       150
       +
       @@ -75,11 +47,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI

     

       151
       151
       +
            )

     

       152
       152
       +
        

     

       153
       153
       +
        !!IF !isEmpty(CMAKE_WINDOWS_BUILD)

     

       154
       154
       +
       -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       155
       155
       +
       -    set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       156
       156
       +
       -!!ELSE

     

       157
       157
       +
            set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       158
       158
       +
       -!!ENDIF

     

       159
       159
       +
            _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})

     

       160
       160
       +
            if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")

     

       161
       161
       +
                set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES

     

       162
       162
       +
       @@ -95,24 +63,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})

     

       163
       163
       +
        !!IF !no_module_headers

     

       164
       164
       +
        !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)

     

       165
       165
       +
            set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS

     

       166
       166
       +
       -      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"

     

       167
       167
       +
       -      \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"

     

       168
       168
       +
       +      \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"

     

       169
       169
       +
       +      \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"

     

       170
       170
       +
            )

     

       171
       171
       +
        !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)

     

       172
       172
       +
            set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS

     

       173
       173
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"

     

       174
       174
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"

     

       175
       175
       +
       -    )

     

       176
       176
       +
       -!!ELSE

     

       177
       177
       +
       -    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")

     

       178
       178
       +
       -!!ENDIF

     

       179
       179
       +
       -!!ELSE

     

       180
       180
       +
       -!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)

     

       181
       181
       +
       -    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")

     

       182
       182
       +
       -!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)

     

       183
       183
       +
       -    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS

     

       184
       184
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"

     

       185
       185
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"

     

       186
       186
       +
       +        \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"

     

       187
       187
       +
       +        \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"

     

       188
       188
       +
            )

     

       189
       189
       +
        !!ELSE

     

       190
       190
       +
            set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")

     

       191
       191
       +
       @@ -128,7 +85,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})

     

       192
       192
       +
            set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")

     

       193
       193
       +
        !!ENDIF

     

       194
       194
       +
        !!ENDIF

     

       195
       195
       +
       -!!ENDIF

     

       196
       196
       +
        !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)

     

       197
       197
       +
            include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)

     

       198
       198
       +
        !!ENDIF

     

       199
       199
       +
       @@ -280,25 +236,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})

     

       200
       200
       +
        !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)

     

       201
       201
       +
        !!IF isEmpty(CMAKE_DEBUG_TYPE)

     

       202
       202
       +
        !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)

     

       203
       203
       +
       -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       204
       204
       +
       -    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )

     

       205
       205
       +
       -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE

     

       206
       206
       +
            if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )

     

       207
       207
       +
       -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE

     

       208
       208
       +
                _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )

     

       209
       209
       +
        !!ELSE // CMAKE_STATIC_WINDOWS_BUILD

     

       210
       210
       +
            if (EXISTS

     

       211
       211
       +
       -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)

     

       212
       212
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"

     

       213
       213
       +
       -!!ELSE

     

       214
       214
       +
                \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"

     

       215
       215
       +
       -!!ENDIF

     

       216
       216
       +
              AND EXISTS

     

       217
       217
       +
       -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       218
       218
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )

     

       219
       219
       +
       -!!ELSE

     

       220
       220
       +
                \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )

     

       221
       221
       +
       -!!ENDIF

     

       222
       222
       +
                _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )

     

       223
       223
       +
        !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD

     

       224
       224
       +
            endif()

     

       225
       225
       +
       @@ -317,25 +261,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})

     

       226
       226
       +
        !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)

     

       227
       227
       +
        !!IF isEmpty(CMAKE_RELEASE_TYPE)

     

       228
       228
       +
        !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)

     

       229
       229
       +
       -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       230
       230
       +
       -    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )

     

       231
       231
       +
       -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE

     

       232
       232
       +
            if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )

     

       233
       233
       +
       -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE

     

       234
       234
       +
                _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )

     

       235
       235
       +
        !!ELSE // CMAKE_STATIC_WINDOWS_BUILD

     

       236
       236
       +
            if (EXISTS

     

       237
       237
       +
       -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)

     

       238
       238
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"

     

       239
       239
       +
       -!!ELSE

     

       240
       240
       +
                \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"

     

       241
       241
       +
       -!!ENDIF

     

       242
       242
       +
              AND EXISTS

     

       243
       243
       +
       -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       244
       244
       +
       -        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )

     

       245
       245
       +
       -!!ELSE

     

       246
       246
       +
                \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )

     

       247
       247
       +
       -!!ENDIF

     

       248
       248
       +
                _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )

     

       249
       249
       +
        !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD

     

       250
       250
       +
            endif()

     

       251
       251
       +
       @@ -354,11 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})

     

       252
       252
       +
            macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)

     

       253
       253
       +
                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       254
       254
       +
        

     

       255
       255
       +
       -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       256
       256
       +
       -        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       257
       257
       +
       -!!ELSE

     

       258
       258
       +
                set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       259
       259
       +
       -!!ENDIF

     

       260
       260
       +
                _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})

     

       261
       261
       +
                set_target_properties(Qt5::${Plugin} PROPERTIES

     

       262
       262
       +
                    \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}

     

       263
       263
       +
       diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf

     

       264
       264
       +
       index e645ba5803..a0e5c68b7e 100644

     

       265
       265
       +
       --- a/mkspecs/features/mac/default_post.prf

     

       266
       266
       +
       +++ b/mkspecs/features/mac/default_post.prf

     

       267
       267
       +
       @@ -24,166 +24,3 @@ qt {

     

       268
       268
       +
                }

     

       269
       269
       +
            }

     

       270
       270
       +
        }

     

       271
       271
       +
       -

     

       272
       272
       +
       -# Add the same default rpaths as Xcode does for new projects.

     

       273
       273
       +
       -# This is especially important for iOS/tvOS/watchOS where no other option is possible.

     

       274
       274
       +
       -!no_default_rpath {

     

       275
       275
       +
       -    QMAKE_RPATHDIR += @executable_path/Frameworks

     

       276
       276
       +
       -    equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks

     

       277
       277
       +
       -}

     

       278
       278
       +
       -

     

       279
       279
       +
       -# Don't pass -headerpad_max_install_names when using Bitcode.

     

       280
       280
       +
       -# In that case the linker emits a warning stating that the flag is ignored when

     

       281
       281
       +
       -# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962).

     

       282
       282
       +
       -# Using this flag is also unnecessary in practice on UIKit platforms since they

     

       283
       283
       +
       -# are sandboxed, and only UIKit platforms support bitcode to begin with.

     

       284
       284
       +
       -!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD

     

       285
       285
       +
       -

     

       286
       286
       +
       -app_extension_api_only {

     

       287
       287
       +
       -    QMAKE_CFLAGS              += $$QMAKE_CFLAGS_APPLICATION_EXTENSION

     

       288
       288
       +
       -    QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS_APPLICATION_EXTENSION

     

       289
       289
       +
       -    QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION

     

       290
       290
       +
       -    QMAKE_LFLAGS              += $$QMAKE_CFLAGS_APPLICATION_EXTENSION

     

       291
       291
       +
       -}

     

       292
       292
       +
       -

     

       293
       293
       +
       -macx-xcode {

     

       294
       294
       +
       -    !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {

     

       295
       295
       +
       -        debug_information_format.name = DEBUG_INFORMATION_FORMAT

     

       296
       296
       +
       -        debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT

     

       297
       297
       +
       -        debug_information_format.build = debug

     

       298
       298
       +
       -        QMAKE_MAC_XCODE_SETTINGS += debug_information_format

     

       299
       299
       +
       -    }

     

       300
       300
       +
       -

     

       301
       301
       +
       -    QMAKE_XCODE_ARCHS =

     

       302
       302
       +
       -

     

       303
       303
       +
       -    arch_device.name = "ARCHS[sdk=$${device.sdk}*]"

     

       304
       304
       +
       -    arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS

     

       305
       305
       +
       -    QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS

     

       306
       306
       +
       -    QMAKE_MAC_XCODE_SETTINGS += arch_device

     

       307
       307
       +
       -

     

       308
       308
       +
       -    simulator {

     

       309
       309
       +
       -        arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"

     

       310
       310
       +
       -        arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS

     

       311
       311
       +
       -        QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS

     

       312
       312
       +
       -        QMAKE_MAC_XCODE_SETTINGS += arch_simulator

     

       313
       313
       +
       -    }

     

       314
       314
       +
       -

     

       315
       315
       +
       -    only_active_arch.name = ONLY_ACTIVE_ARCH

     

       316
       316
       +
       -    only_active_arch.value = YES

     

       317
       317
       +
       -    only_active_arch.build = debug

     

       318
       318
       +
       -    QMAKE_MAC_XCODE_SETTINGS += only_active_arch

     

       319
       319
       +
       -} else {

     

       320
       320
       +
       -    device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS

     

       321
       321
       +
       -    simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS

     

       322
       322
       +
       -    VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS

     

       323
       323
       +
       -

     

       324
       324
       +
       -    isEmpty(VALID_ARCHS): \

     

       325
       325
       +
       -        error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")

     

       326
       326
       +
       -

     

       327
       327
       +
       -    single_arch: VALID_ARCHS = $$first(VALID_ARCHS)

     

       328
       328
       +
       -

     

       329
       329
       +
       -    ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))

     

       330
       330
       +
       -    ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))

     

       331
       331
       +
       -

     

       332
       332
       +
       -    QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS

     

       333
       333
       +
       -

     

       334
       334
       +
       -    arch_flags = $(EXPORT_ARCH_ARGS)

     

       335
       335
       +
       -

     

       336
       336
       +
       -    QMAKE_CFLAGS += $$arch_flags

     

       337
       337
       +
       -    QMAKE_CXXFLAGS += $$arch_flags

     

       338
       338
       +
       -    QMAKE_LFLAGS += $$arch_flags

     

       339
       339
       +
       -

     

       340
       340
       +
       -    QMAKE_PCH_ARCHS = $$VALID_ARCHS

     

       341
       341
       +
       -

     

       342
       342
       +
       -    macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET

     

       343
       343
       +
       -    ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET

     

       344
       344
       +
       -    tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET

     

       345
       345
       +
       -    watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET

     

       346
       346
       +
       -

     

       347
       347
       +
       -    # If we're doing a simulator and device build, device and simulator

     

       348
       348
       +
       -    # architectures use different paths and flags for the sysroot and

     

       349
       349
       +
       -    # deployment target switch, so we must multiplex them across multiple

     

       350
       350
       +
       -    # architectures using -Xarch. Otherwise we fall back to the simple path.

     

       351
       351
       +
       -    # This is not strictly necessary, but results in cleaner command lines

     

       352
       352
       +
       -    # and makes it easier for people to override EXPORT_VALID_ARCHS to limit

     

       353
       353
       +
       -    # individual rules to a different set of architecture(s) from the overall

     

       354
       354
       +
       -    # build (such as machtest in QtCore).

     

       355
       355
       +
       -    simulator:device {

     

       356
       356
       +
       -        QMAKE_XARCH_CFLAGS =

     

       357
       357
       +
       -        QMAKE_XARCH_LFLAGS =

     

       358
       358
       +
       -        QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS

     

       359
       359
       +
       -

     

       360
       360
       +
       -        for (arch, VALID_ARCHS) {

     

       361
       361
       +
       -            contains(VALID_SIMULATOR_ARCHS, $$arch) {

     

       362
       362
       +
       -                sdk = $$simulator.sdk

     

       363
       363
       +
       -                version_identifier = $$simulator.deployment_identifier

     

       364
       364
       +
       -            } else {

     

       365
       365
       +
       -                sdk = $$device.sdk

     

       366
       366
       +
       -                version_identifier = $$device.deployment_identifier

     

       367
       367
       +
       -            }

     

       368
       368
       +
       -

     

       369
       369
       +
       -            version_min_flags = \

     

       370
       370
       +
       -                -Xarch_$${arch} \

     

       371
       371
       +
       -                -m$${version_identifier}-version-min=$$deployment_target

     

       372
       372
       +
       -            QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \

     

       373
       373
       +
       -                -Xarch_$${arch} \

     

       374
       374
       +
       -                -isysroot$$xcodeSDKInfo(Path, $$sdk)

     

       375
       375
       +
       -            QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \

     

       376
       376
       +
       -                -Xarch_$${arch} \

     

       377
       377
       +
       -                -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)

     

       378
       378
       +
       -

     

       379
       379
       +
       -            QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})

     

       380
       380
       +
       -            QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})

     

       381
       381
       +
       -

     

       382
       382
       +
       -            QMAKE_EXTRA_VARIABLES += \

     

       383
       383
       +
       -                QMAKE_XARCH_CFLAGS_$${arch} \

     

       384
       384
       +
       -                QMAKE_XARCH_LFLAGS_$${arch}

     

       385
       385
       +
       -        }

     

       386
       386
       +
       -

     

       387
       387
       +
       -        QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)

     

       388
       388
       +
       -        QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)

     

       389
       389
       +
       -        QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS)

     

       390
       390
       +
       -    } else {

     

       391
       391
       +
       -        simulator: \

     

       392
       392
       +
       -            version_identifier = $$simulator.deployment_identifier

     

       393
       393
       +
       -        else: \

     

       394
       394
       +
       -            version_identifier = $$device.deployment_identifier

     

       395
       395
       +
       -        version_min_flag = -m$${version_identifier}-version-min=$$deployment_target

     

       396
       396
       +
       -        QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag

     

       397
       397
       +
       -        QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag

     

       398
       398
       +
       -        QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag

     

       399
       399
       +
       -    }

     

       400
       400
       +
       -

     

       401
       401
       +
       -    # Enable precompiled headers for multiple architectures

     

       402
       402
       +
       -    QMAKE_CFLAGS_USE_PRECOMPILE =

     

       403
       403
       +
       -    for (arch, VALID_ARCHS) {

     

       404
       404
       +
       -        icc_pch_style: \

     

       405
       405
       +
       -            use_flag = "-pch-use "

     

       406
       406
       +
       -        else: \

     

       407
       407
       +
       -            use_flag = -include

     

       408
       408
       +
       -

     

       409
       409
       +
       -        # Only use Xarch with multi-arch, as the option confuses ccache

     

       410
       410
       +
       -        count(VALID_ARCHS, 1, greaterThan): \

     

       411
       411
       +
       -            QMAKE_CFLAGS_USE_PRECOMPILE += \

     

       412
       412
       +
       -                -Xarch_$${arch}

     

       413
       413
       +
       -

     

       414
       414
       +
       -        QMAKE_CFLAGS_USE_PRECOMPILE += \

     

       415
       415
       +
       -            $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}}

     

       416
       416
       +
       -    }

     

       417
       417
       +
       -    icc_pch_style {

     

       418
       418
       +
       -        QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT}

     

       419
       419
       +
       -        QMAKE_CFLAGS_USE_PRECOMPILE =

     

       420
       420
       +
       -    } else {

     

       421
       421
       +
       -        QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE

     

       422
       422
       +
       -        QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE

     

       423
       423
       +
       -        QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE

     

       424
       424
       +
       -    }

     

       425
       425
       +
       -

     

       426
       426
       +
       -    QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}

     

       427
       427
       +
       -}

     

       428
       428
       +
       -

     

       429
       429
       +
       -cache(QMAKE_XCODE_DEVELOPER_PATH, stash)

     

       430
       430
       +
       -!isEmpty(QMAKE_XCODE_VERSION): \

     

       431
       431
       +
       -    cache(QMAKE_XCODE_VERSION, stash)

     

       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

     

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

     

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

     

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

     

       439
       439
       +
        CONFIG = asset_catalogs rez $$CONFIG

     

       440
       440
       +
        load(default_pre)

     

       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")

     

       445
       445
       +
       -    isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \

     

       446
       446
       +
       -        error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.")

     

       447
       447
       +
       -

     

       448
       448
       +
       -    # Make sure Xcode path is valid

     

       449
       449
       +
       -    !exists($$QMAKE_XCODE_DEVELOPER_PATH): \

     

       450
       450
       +
       -        error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")

     

       451
       451
       +
       -}

     

       452
       452
       +
       -

     

       453
       453
       +
       -isEmpty(QMAKE_XCODEBUILD_PATH): \

     

       454
       454
       +
       -    QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")

     

       455
       455
       +
       -

     

       456
       456
       +
       -!isEmpty(QMAKE_XCODEBUILD_PATH) {

     

       457
       457
       +
       -    # Make sure Xcode is set up properly

     

       458
       458
       +
       -    !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \

     

       459
       459
       +
       -        error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.")

     

       460
       460
       +
       -

     

       461
       461
       +
       -    isEmpty(QMAKE_XCODE_VERSION) {

     

       462
       462
       +
       -        # Extract Xcode version using xcodebuild

     

       463
       463
       +
       -        xcode_version = $$system("/usr/bin/xcrun xcodebuild -version")

     

       464
       464
       +
       -        QMAKE_XCODE_VERSION = $$member(xcode_version, 1)

     

       465
       465
       +
       -        isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")

     

       466
       466
       +
       -        unset(xcode_version)

     

       467
       467
       +
       -    }

     

       468
       468
       +
       -}

     

       469
       469
       +
       -

     

       470
       470
       +
       -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {

     

       471
       471
       +
       -    QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist

     

       472
       472
       +
       -    exists($$QMAKE_XCODE_PREFERENCES_FILE): \

     

       473
       473
       +
       -        QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null")

     

       474
       474
       +
       -

     

       475
       475
       +
       -    !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \

     

       476
       476
       +
       -        cache(QMAKE_TARGET_BUNDLE_PREFIX)

     

       477
       477
       +
       -}

     

       478
       478
       +
       -

     

       479
       479
       +
       -QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon

     

       480
       480
       +
       -

     

       481
       481
       +
       -# Make the default debug info format for static debug builds

     

       482
       482
       +
       -# DWARF instead of DWARF with dSYM. This cuts down build times

     

       483
       483
       +
       -# for application debug builds significantly, as Xcode doesn't

     

       484
       484
       +
       -# have to pull out all the DWARF info from the Qt static libs

     

       485
       485
       +
       -# and put it into a dSYM file. We don't need that dSYM file in

     

       486
       486
       +
       -# the first place, since the information is available in the

     

       487
       487
       +
       -# object files inside the archives (static libraries).

     

       488
       488
       +
       -macx-xcode:qtConfig(static): \

     

       489
       489
       +
       -    QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf

     

       490
       490
       +
       -

     

       491
       491
       +
       -# This variable is used by the xcode_dynamic_library_suffix

     

       492
       492
       +
       -# feature, which allows Xcode to choose the Qt libraries to link to

     

       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

     

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

     

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

     

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

     

       500
       500
       +
        

     

       501
       501
       +
       -isEmpty(QMAKE_MAC_SDK): \

     

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

     

       503
       503
       +
       -

     

       504
       504
       +
       -contains(QMAKE_MAC_SDK, .*/.*): \

     

       505
       505
       +
       -    error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")

     

       506
       506
       +
       -

     

       507
       507
       +
       -defineReplace(xcodeSDKInfo) {

     

       508
       508
       +
       -    info = $$1

     

       509
       509
       +
       -    equals(info, "Path"): \

     

       510
       510
       +
       -        info = --show-sdk-path

     

       511
       511
       +
       -    equals(info, "PlatformPath"): \

     

       512
       512
       +
       -        info = --show-sdk-platform-path

     

       513
       513
       +
       -    equals(info, "SDKVersion"): \

     

       514
       514
       +
       -        info = --show-sdk-version

     

       515
       515
       +
       -    sdk = $$2

     

       516
       516
       +
       -    isEmpty(sdk): \

     

       517
       517
       +
       -        sdk = $$QMAKE_MAC_SDK

     

       518
       518
       +
       -

     

       519
       519
       +
       -    isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {

     

       520
       520
       +
       -        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")

     

       521
       521
       +
       -        # --show-sdk-platform-path won't work for Command Line Tools; this is fine

     

       522
       522
       +
       -        # only used by the XCTest backend to testlib

     

       523
       523
       +
       -        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \

     

       524
       524
       +
       -            error("Could not resolve SDK $$info for \'$$sdk\'")

     

       525
       525
       +
       -        cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})

     

       526
       526
       +
       -    }

     

       527
       527
       +
       -

     

       528
       528
       +
       -    return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info}))

     

       529
       529
       +
       -}

     

       530
       530
       +
       -

     

       531
       531
       +
       -QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)

     

       532
       532
       +
       -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)

     

       533
       533
       +
       -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)

     

       534
       534
       +
       -

     

       535
       535
       +
       -sysrootified =

     

       536
       536
       +
       -for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val

     

       537
       537
       +
       -QMAKE_INCDIR_OPENGL = $$sysrootified

     

       538
       538
       +
       -

     

       539
       539
       +
       -QMAKESPEC_NAME = $$basename(QMAKESPEC)

     

       540
       540
       +
       -

     

       541
       541
       +
       -# Resolve SDK version of various tools

     

       542
       542
       +
       -for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) {

     

       543
       543
       +
       -    tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}

     

       544
       544
       +
       -    !isEmpty($$tool_variable) {

     

       545
       545
       +
       -        $$tool = $$eval($$tool_variable)

     

       546
       546
       +
       -        next()

     

       547
       547
       +
       -    }

     

       548
       548
       +
       -

     

       549
       549
       +
       -    value = $$eval($$tool)

     

       550
       550
       +
       -    isEmpty(value): next()

     

       551
       551
       +
       -

     

       552
       552
       +
       -    sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null")

     

       553
       553
       +
       -    isEmpty(sysrooted): next()

     

       554
       554
       +
       -

     

       555
       555
       +
       -    $$tool = $$sysrooted $$member(value, 1, -1)

     

       556
       556
       +
       -    cache($$tool_variable, set stash, $$tool)

     

       557
       557
       +
       -}

     

       558
       558
       +
       diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf

     

       559
       559
       +
       index 4db0040dc5..65d6da1f4d 100644

     

       560
       560
       +
       --- a/mkspecs/features/qml_module.prf

     

       561
       561
       +
       +++ b/mkspecs/features/qml_module.prf

     

       562
       562
       +
       @@ -23,13 +23,8 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL

     

       563
       563
       +
        

     

       564
       564
       +
        load(qt_build_paths)

     

       565
       565
       +
        

     

       566
       566
       +
       -qml1_target {

     

       567
       567
       +
       -    DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH

     

       568
       568
       +
       -    instbase = $$[QT_INSTALL_IMPORTS]

     

       569
       569
       +
       -} else {

     

       570
       570
       +
       -    DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH

     

       571
       571
       +
       -    instbase = $$[QT_INSTALL_QML]

     

       572
       572
       +
       -}

     

       573
       573
       +
       +DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH

     

       574
       574
       +
       +instbase = $$NIX_OUTPUT_QML

     

       575
       575
       +
        

     

       576
       576
       +
        !qml1_target:static: CONFIG += builtin_resources

     

       577
       577
       +
        

     

       578
       578
       +
       diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf

     

       579
       579
       +
       index d49f4c49c1..097dcd7d39 100644

     

       580
       580
       +
       --- a/mkspecs/features/qml_plugin.prf

     

       581
       581
       +
       +++ b/mkspecs/features/qml_plugin.prf

     

       582
       582
       +
       @@ -48,13 +48,8 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE

     

       583
       583
       +
        

     

       584
       584
       +
        load(qt_build_paths)

     

       585
       585
       +
        

     

       586
       586
       +
       -qml1_target {

     

       587
       587
       +
       -    DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH

     

       588
       588
       +
       -    instbase = $$[QT_INSTALL_IMPORTS]

     

       589
       589
       +
       -} else {

     

       590
       590
       +
       -    DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH

     

       591
       591
       +
       -    instbase = $$[QT_INSTALL_QML]

     

       592
       592
       +
       -}

     

       593
       593
       +
       +DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH

     

       594
       594
       +
       +instbase = $$NIX_OUTPUT_QML

     

       595
       595
       +
        

     

       596
       596
       +
        target.path = $$instbase/$$TARGETPATH

     

       597
       597
       +
        INSTALLS += target

     

       598
       598
       +
       diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf

     

       599
       599
       +
       index 883f8ca215..81db8eb2d4 100644

     

       600
       600
       +
       --- a/mkspecs/features/qt_app.prf

     

       601
       601
       +
       +++ b/mkspecs/features/qt_app.prf

     

       602
       602
       +
       @@ -33,7 +33,7 @@ host_build:force_bootstrap {

     

       603
       603
       +
            target.path = $$[QT_HOST_BINS]

     

       604
       604
       +
        } else {

     

       605
       605
       +
            !build_pass:qtConfig(debug_and_release): CONFIG += release

     

       606
       606
       +
       -    target.path = $$[QT_INSTALL_BINS]

     

       607
       607
       +
       +    target.path = $$NIX_OUTPUT_BIN/bin

     

       608
       608
       +
            CONFIG += relative_qt_rpath  # Qt's tools and apps should be relocatable

     

       609
       609
       +
        }

     

       610
       610
       +
        INSTALLS += target

     

       611
       611
       +
       diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf

     

       612
       612
       +
       index 1848f00e90..2af93675c5 100644

     

       613
       613
       +
       --- a/mkspecs/features/qt_build_paths.prf

     

       614
       614
       +
       +++ b/mkspecs/features/qt_build_paths.prf

     

       615
       615
       +
       @@ -23,6 +23,6 @@ exists($$MODULE_BASE_INDIR/.git): \

     

       616
       616
       +
        !force_independent {

     

       617
       617
       +
            # If the module is not built independently, everything ends up in qtbase.

     

       618
       618
       +
            # This is the case in non-prefix builds, except for selected modules.

     

       619
       619
       +
       -    MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX]

     

       620
       620
       +
       -    MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX]

     

       621
       621
       +
       +    MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT

     

       622
       622
       +
       +    MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT

     

       623
       623
       +
        }

     

       624
       624
       +
       diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf

     

       625
       625
       +
       index f4ae5bde80..6d4c6d223f 100644

     

       626
       626
       +
       --- a/mkspecs/features/qt_common.prf

     

       627
       627
       +
       +++ b/mkspecs/features/qt_common.prf

     

       628
       628
       +
       @@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) {

     

       629
       629
       +
                qqt_libdir = \$\$\$\$[QT_HOST_LIBS]

     

       630
       630
       +
                qt_libdir = $$[QT_HOST_LIBS]

     

       631
       631
       +
            } else {

     

       632
       632
       +
       -        qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]

     

       633
       633
       +
       -        qt_libdir = $$[QT_INSTALL_LIBS]

     

       634
       634
       +
       +        qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib

     

       635
       635
       +
       +        qt_libdir = $$NIX_OUTPUT_OUT/lib

     

       636
       636
       +
            }

     

       637
       637
       +
            contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {

     

       638
       638
       +
                lib_replace.match = "[^ ']*$$rplbase/lib"

     

       639
       639
       +
       diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf

     

       640
       640
       +
       index 72dde61a40..f891a2baed 100644

     

       641
       641
       +
       --- a/mkspecs/features/qt_docs.prf

     

       642
       642
       +
       +++ b/mkspecs/features/qt_docs.prf

     

       643
       643
       +
       @@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR

     

       644
       644
       +
        

     

       645
       645
       +
        QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)

     

       646
       646
       +
        !build_online_docs: \

     

       647
       647
       +
       -    QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS])

     

       648
       648
       +
       +    QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC)

     

       649
       649
       +
        PREP_DOC_INDEXES =

     

       650
       650
       +
        DOC_INDEXES =

     

       651
       651
       +
        !isEmpty(QTREPOS) {

     

       652
       652
       +
       @@ -64,8 +64,8 @@ DOC_INDEXES =

     

       653
       653
       +
                DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc)

     

       654
       654
       +
        } else {

     

       655
       655
       +
            prepare_docs: \

     

       656
       656
       +
       -        PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])

     

       657
       657
       +
       -    DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])

     

       658
       658
       +
       +        PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC)

     

       659
       659
       +
       +    DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC)

     

       660
       660
       +
        }

     

       661
       661
       +
        

     

       662
       662
       +
        qtattributionsscanner.target = qtattributionsscanner

     

       663
       663
       +
       @@ -88,12 +88,12 @@ prepare_docs {

     

       664
       664
       +
            qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch)

     

       665
       665
       +
        

     

       666
       666
       +
            inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR

     

       667
       667
       +
       -    inst_html_docs.path = $$[QT_INSTALL_DOCS]

     

       668
       668
       +
       +    inst_html_docs.path = $$NIX_OUTPUT_DOC

     

       669
       669
       +
            inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build

     

       670
       670
       +
            INSTALLS += inst_html_docs

     

       671
       671
       +
        

     

       672
       672
       +
            inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch

     

       673
       673
       +
       -    inst_qch_docs.path = $$[QT_INSTALL_DOCS]

     

       674
       674
       +
       +    inst_qch_docs.path = $$NIX_OUTPUT_DOC

     

       675
       675
       +
            inst_qch_docs.CONFIG += no_check_exist no_default_install no_build

     

       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

     

       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)

     

       691
       691
       +
       -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

     

       700
       700
       +
        

     

       701
       701
       +
        check_examples {

     

       702
       702
       +
            srcfiles = $$sources.files

     

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

     

       704
       704
       +
       index 1903e509c8..ae7b585989 100644

     

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

     

       706
       706
       +
       +++ b/mkspecs/features/qt_functions.prf

     

       707
       707
       +
       @@ -69,7 +69,7 @@ defineTest(qtHaveModule) {

     

       708
       708
       +
        defineTest(qtPrepareTool) {

     

       709
       709
       +
            cmd = $$eval(QT_TOOL.$${2}.binary)

     

       710
       710
       +
            isEmpty(cmd) {

     

       711
       711
       +
       -        cmd = $$[QT_HOST_BINS]/$$2

     

       712
       712
       +
       +        cmd = $$system("command -v $$2")

     

       713
       713
       +
                exists($${cmd}.pl) {

     

       714
       714
       +
                    $${1}_EXE = $${cmd}.pl

     

       715
       715
       +
                    cmd = perl -w $$system_path($${cmd}.pl)

     

       716
       716
       +
       diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf

     

       717
       717
       +
       index 90d84cc535..387481bfc6 100644

     

       718
       718
       +
       --- a/mkspecs/features/qt_installs.prf

     

       719
       719
       +
       +++ b/mkspecs/features/qt_installs.prf

     

       720
       720
       +
       @@ -12,16 +12,10 @@

     

       721
       721
       +
        #library

     

       722
       722
       +
        !qt_no_install_library {

     

       723
       723
       +
            win32 {

     

       724
       724
       +
       -       host_build: \

     

       725
       725
       +
       -           dlltarget.path = $$[QT_HOST_BINS]

     

       726
       726
       +
       -       else: \

     

       727
       727
       +
       -           dlltarget.path = $$[QT_INSTALL_BINS]

     

       728
       728
       +
       +        dlltarget.path = $$NIX_OUTPUT_BIN/bin

     

       729
       729
       +
               INSTALLS += dlltarget

     

       730
       730
       +
            }

     

       731
       731
       +
       -    host_build: \

     

       732
       732
       +
       -        target.path = $$[QT_HOST_LIBS]

     

       733
       733
       +
       -    else: \

     

       734
       734
       +
       -        target.path = $$[QT_INSTALL_LIBS]

     

       735
       735
       +
       +    target.path = $$NIX_OUTPUT_OUT/lib

     

       736
       736
       +
            !static: target.CONFIG = no_dll

     

       737
       737
       +
            INSTALLS += target

     

       738
       738
       +
        }

     

       739
       739
       +
       @@ -29,33 +23,33 @@

     

       740
       740
       +
        #headers

     

       741
       741
       +
        qt_install_headers {

     

       742
       742
       +
            class_headers.files = $$SYNCQT.HEADER_CLASSES

     

       743
       743
       +
       -    class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME

     

       744
       744
       +
       +    class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME

     

       745
       745
       +
            INSTALLS += class_headers

     

       746
       746
       +
        

     

       747
       747
       +
            targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES

     

       748
       748
       +
       -    targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME

     

       749
       749
       +
       +    targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME

     

       750
       750
       +
            INSTALLS += targ_headers

     

       751
       751
       +
        

     

       752
       752
       +
            private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES

     

       753
       753
       +
       -    private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private

     

       754
       754
       +
       +    private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private

     

       755
       755
       +
            INSTALLS += private_headers

     

       756
       756
       +
        

     

       757
       757
       +
            qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES

     

       758
       758
       +
       -    qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa

     

       759
       759
       +
       +    qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa

     

       760
       760
       +
            INSTALLS += qpa_headers

     

       761
       761
       +
        }

     

       762
       762
       +
        

     

       763
       763
       +
        #module

     

       764
       764
       +
        qt_install_module {

     

       765
       765
       +
            !isEmpty(MODULE_PRI) {

     

       766
       766
       +
       -        pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules

     

       767
       767
       +
       +        pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules

     

       768
       768
       +
                pritarget.files = $$MODULE_PRI

     

       769
       769
       +
                INSTALLS += pritarget

     

       770
       770
       +
            } else: isEmpty(MODULE_PRIVATE_PRI) {

     

       771
       771
       +
                warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.")

     

       772
       772
       +
            }

     

       773
       773
       +
            !isEmpty(MODULE_PRIVATE_PRI) {

     

       774
       774
       +
       -        privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules

     

       775
       775
       +
       +        privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules

     

       776
       776
       +
                privpritarget.files = $$MODULE_PRIVATE_PRI

     

       777
       777
       +
                INSTALLS += privpritarget

     

       778
       778
       +
            }

     

       779
       779
       +
       diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf

     

       780
       780
       +
       index 62e1b69fde..abd63123f9 100644

     

       781
       781
       +
       --- a/mkspecs/features/qt_plugin.prf

     

       782
       782
       +
       +++ b/mkspecs/features/qt_plugin.prf

     

       783
       783
       +
       @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {

     

       784
       784
       +
            }

     

       785
       785
       +
        }

     

       786
       786
       +
        

     

       787
       787
       +
       -target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE

     

       788
       788
       +
       +target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE

     

       789
       789
       +
        INSTALLS += target

     

       790
       790
       +
        

     

       791
       791
       +
        TARGET = $$qt5LibraryTarget($$TARGET)

     

       792
       792
       +
       diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       793
       793
       +
       index 545b9a3d1e..6ac0cdefe4 100644

     

       794
       794
       +
       --- a/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       795
       795
       +
       +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       796
       796
       +
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)

     

       797
       797
       +
            add_executable(Qt5::qmake IMPORTED)

     

       798
       798
       +
        

     

       799
       799
       +
        !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       800
       800
       +
       -    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")

     

       801
       801
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")

     

       802
       802
       +
        !!ELSE

     

       803
       803
       +
            set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")

     

       804
       804
       +
        !!ENDIF

     

       805
       805
       +
       @@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)

     

       806
       806
       +
            add_executable(Qt5::moc IMPORTED)

     

       807
       807
       +
        

     

       808
       808
       +
        !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       809
       809
       +
       -    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")

     

       810
       810
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")

     

       811
       811
       +
        !!ELSE

     

       812
       812
       +
            set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")

     

       813
       813
       +
        !!ENDIF

     

       814
       814
       +
       @@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)

     

       815
       815
       +
            add_executable(Qt5::rcc IMPORTED)

     

       816
       816
       +
        

     

       817
       817
       +
        !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       818
       818
       +
       -    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")

     

       819
       819
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")

     

       820
       820
       +
        !!ELSE

     

       821
       821
       +
            set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")

     

       822
       822
       +
        !!ENDIF

     

       823
       823
       +
       @@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain)

     

       824
       824
       +
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       825
       825
       +
            set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

     

       826
       826
       +
        !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       827
       827
       +
       -    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")

     

       828
       828
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")

     

       829
       829
       +
        !!ELSE

     

       830
       830
       +
            set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")

     

       831
       831
       +
        !!ENDIF

     

       832
       832
       +
       @@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain)

     

       833
       833
       +
            set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)

     

       834
       834
       +
        

     

       835
       835
       +
        !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

       836
       836
       +
       -    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")

     

       837
       837
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")

     

       838
       838
       +
        !!ELSE

     

       839
       839
       +
            set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")

     

       840
       840
       +
        !!ENDIF

     

       841
       841
       +
       diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       842
       842
       +
       index c357237d0e..6f0c75de3c 100644

     

       843
       843
       +
       --- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       844
       844
       +
       +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       845
       845
       +
       @@ -1,6 +1,6 @@

     

       846
       846
       +
        

     

       847
       847
       +
        !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)

     

       848
       848
       +
       -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")

     

       849
       849
       +
       +set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")

     

       850
       850
       +
        !!ELSE

     

       851
       851
       +
        set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       852
       852
       +
        !!ENDIF

     

       853
       853
       +
       diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       854
       854
       +
       index 706304cf34..546420f6ad 100644

     

       855
       855
       +
       --- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       856
       856
       +
       +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       857
       857
       +
       @@ -1,6 +1,6 @@

     

       858
       858
       +
        

     

       859
       859
       +
        !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)

     

       860
       860
       +
       -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")

     

       861
       861
       +
       +set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")

     

       862
       862
       +
        !!ELSE

     

       863
       863
       +
        set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       864
       864
       +
        !!ENDIF

     

       865
       865
       +
       diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp

     

       866
       866
       +
       index 609e52d9d2..f0f29ce61f 100644

     

       867
       867
       +
       --- a/src/corelib/kernel/qcoreapplication.cpp

     

       868
       868
       +
       +++ b/src/corelib/kernel/qcoreapplication.cpp

     

       869
       869
       +
       @@ -2580,6 +2580,15 @@ QStringList QCoreApplication::libraryPaths()

     

       870
       870
       +
                QStringList *app_libpaths = new QStringList;

     

       871
       871
       +
                coreappdata()->app_libpaths.reset(app_libpaths);

     

       872
       872
       +
        

     

       873
       873
       +
       +        // Add library paths derived from PATH

     

       874
       874
       +
       +        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');

     

       875
       875
       +
       +        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);

     

       876
       876
       +
       +        for (const QString &path: paths) {

     

       877
       877
       +
       +            if (!path.isEmpty()) {

     

       878
       878
       +
       +                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));

     

       879
       879
       +
       +            }

     

       880
       880
       +
       +        }

     

       881
       881
       +
       +

     

       882
       882
       +
                const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");

     

       883
       883
       +
                if (!libPathEnv.isEmpty()) {

     

       884
       884
       +
                    QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);

     

       885
       885
       +
       diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp

     

       886
       886
       +
       index bcc1285472..a77eb472a3 100644

     

       887
       887
       +
       --- a/src/corelib/tools/qtimezoneprivate_tz.cpp

     

       888
       888
       +
       +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp

     

       889
       889
       +
       @@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;

     

       890
       890
       +
        // Parse zone.tab table, assume lists all installed zones, if not will need to read directories

     

       891
       891
       +
        static QTzTimeZoneHash loadTzTimeZones()

     

       892
       892
       +
        {

     

       893
       893
       +
       -    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");

     

       894
       894
       +
       +    // Try TZDIR first, in case we're running on NixOS.

     

       895
       895
       +
       +    QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab");

     

       896
       896
       +
       +    // Fallback to traditional paths in case we are not on NixOS.

     

       897
       897
       +
       +    if (!QFile::exists(path))

     

       898
       898
       +
       +        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");

     

       899
       899
       +
            if (!QFile::exists(path))

     

       900
       900
       +
                path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");

     

       901
       901
       +
        

     

       902
       902
       +
       @@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)

     

       903
       903
       +
                if (!tzif.open(QIODevice::ReadOnly))

     

       904
       904
       +
                    return;

     

       905
       905
       +
            } else {

     

       906
       906
       +
       -        // Open named tz, try modern path first, if fails try legacy path

     

       907
       907
       +
       -        tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));

     

       908
       908
       +
       +        // Try TZDIR first, in case we're running on NixOS

     

       909
       909
       +
       +        tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId));

     

       910
       910
       +
                if (!tzif.open(QIODevice::ReadOnly)) {

     

       911
       911
       +
       -            tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));

     

       912
       912
       +
       -            if (!tzif.open(QIODevice::ReadOnly))

     

       913
       913
       +
       -                return;

     

       914
       914
       +
       +            // Open named tz, try modern path first, if fails try legacy path

     

       915
       915
       +
       +            tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));

     

       916
       916
       +
       +            if (!tzif.open(QIODevice::ReadOnly)) {

     

       917
       917
       +
       +                tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));

     

       918
       918
       +
       +                if (!tzif.open(QIODevice::ReadOnly))

     

       919
       919
       +
       +                    return;

     

       920
       920
       +
       +            }

     

       921
       921
       +
                }

     

       922
       922
       +
            }

     

       923
       923
       +
        

     

       924
       924
       +
       diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       925
       925
       +
       index 1d947159e2..b36865fc48 100644

     

       926
       926
       +
       --- a/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       927
       927
       +
       +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       928
       928
       +
       @@ -2,11 +2,7 @@

     

       929
       929
       +
        if (NOT TARGET Qt5::qdbuscpp2xml)

     

       930
       930
       +
            add_executable(Qt5::qdbuscpp2xml IMPORTED)

     

       931
       931
       +
        

     

       932
       932
       +
       -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       933
       933
       +
       -    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")

     

       934
       934
       +
       -!!ELSE

     

       935
       935
       +
       -    set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")

     

       936
       936
       +
       -!!ENDIF

     

       937
       937
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")

     

       938
       938
       +
            _qt5_DBus_check_file_exists(${imported_location})

     

       939
       939
       +
        

     

       940
       940
       +
            set_target_properties(Qt5::qdbuscpp2xml PROPERTIES

     

       941
       941
       +
       @@ -17,11 +13,7 @@ endif()

     

       942
       942
       +
        if (NOT TARGET Qt5::qdbusxml2cpp)

     

       943
       943
       +
            add_executable(Qt5::qdbusxml2cpp IMPORTED)

     

       944
       944
       +
        

     

       945
       945
       +
       -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       946
       946
       +
       -    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       947
       947
       +
       -!!ELSE

     

       948
       948
       +
       -    set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       949
       949
       +
       -!!ENDIF

     

       950
       950
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       951
       951
       +
            _qt5_DBus_check_file_exists(${imported_location})

     

       952
       952
       +
        

     

       953
       953
       +
            set_target_properties(Qt5::qdbusxml2cpp PROPERTIES

     

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

     

       955
       955
       +
       index 07869efd7d..37b95d1b6b 100644

     

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

     

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

     

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

     

       959
       959
       +
        !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)

     

       960
       960
       +
        

     

       961
       961
       +
        !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)

     

       962
       962
       +
       -set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")

     

       963
       963
       +
       +set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\")

     

       964
       964
       +
        !!ELSE

     

       965
       965
       +
        set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")

     

       966
       966
       +
        !!ENDIF

     

       967
       967
       +
       @@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO

     

       968
       968
       +
            set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       969
       969
       +
        

     

       970
       970
       +
        !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)

     

       971
       971
       +
       -    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")

     

       972
       972
       +
       +    set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")

     

       973
       973
       +
        !!ELSE

     

       974
       974
       +
            set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")

     

       975
       975
       +
        !!ENDIF

     

       976
       976
       +
        

     

       977
       977
       +
        !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     

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

     

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

     

       980
       980
       +
        !!ELSE

     

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

     

       982
       982
       +
        !!ENDIF

     

       983
       983
       +
       diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp

     

       984
       984
       +
       index 1da00813ce..0bf877afcb 100644

     

       985
       985
       +
       --- a/src/network/kernel/qdnslookup_unix.cpp

     

       986
       986
       +
       +++ b/src/network/kernel/qdnslookup_unix.cpp

     

       987
       987
       +
       @@ -92,7 +92,7 @@ static bool resolveLibraryInternal()

     

       988
       988
       +
            if (!lib.load())

     

       989
       989
       +
        #endif

     

       990
       990
       +
            {

     

       991
       991
       +
       -        lib.setFileName(QLatin1String("resolv"));

     

       992
       992
       +
       +        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));

     

       993
       993
       +
                if (!lib.load())

     

       994
       994
       +
                    return false;

     

       995
       995
       +
            }

     

       996
       996
       +
       diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp

     

       997
       997
       +
       index 8d2cffc304..9730fb33f2 100644

     

       998
       998
       +
       --- a/src/network/kernel/qhostinfo_unix.cpp

     

       999
       999
       +
       +++ b/src/network/kernel/qhostinfo_unix.cpp

     

       1000
       1000
       +
       @@ -98,7 +98,7 @@ static bool resolveLibraryInternal()

     

       1001
       1001
       +
            if (!lib.load())

     

       1002
       1002
       +
        #endif

     

       1003
       1003
       +
            {

     

       1004
       1004
       +
       -        lib.setFileName(QLatin1String("resolv"));

     

       1005
       1005
       +
       +        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));

     

       1006
       1006
       +
                if (!lib.load())

     

       1007
       1007
       +
                    return false;

     

       1008
       1008
       +
            }

     

       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
       1031
       +
       diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp

     

       1032
       1032
       +
       index b5a0a5bbeb..6c20305f4d 100644

     

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

     

       1034
       1034
       +
       +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp

     

       1035
       1035
       +
       @@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()

     

       1036
       1036
       +
            m_possibleLocations.reserve(7);

     

       1037
       1037
       +
            if (qEnvironmentVariableIsSet("QTCOMPOSE"))

     

       1038
       1038
       +
                m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));

     

       1039
       1039
       +
       -    m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));

     

       1040
       1040
       +
       -    m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));

     

       1041
       1041
       +
       -    m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));

     

       1042
       1042
       +
       -    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));

     

       1043
       1043
       +
            m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));

     

       1044
       1044
       +
            m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));

     

       1045
       1045
       +
       +    m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));

     

       1046
       1046
       +
        }

     

       1047
       1047
       +
        

     

       1048
       1048
       +
        QString TableGenerator::findComposeFile()

     

       1049
       1049
       +
       diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp

     

       1050
       1050
       +
       index 3bc8590d36..2a78fde518 100644

     

       1051
       1051
       +
       --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp

     

       1052
       1052
       +
       +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp

     

       1053
       1053
       +
       @@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)

     

       1054
       1054
       +
        #if QT_CONFIG(library)

     

       1055
       1055
       +
                        extern const QString qt_gl_library_name();

     

       1056
       1056
       +
        //                QLibrary lib(qt_gl_library_name());

     

       1057
       1057
       +
       +                // Check system library paths first

     

       1058
       1058
       +
                        QLibrary lib(QLatin1String("GL"));

     

       1059
       1059
       +
       +#ifdef NIXPKGS_MESA_GL

     

       1060
       1060
       +
       +                if (!lib.load()) {

     

       1061
       1061
       +
       +                    // Fallback to Mesa driver

     

       1062
       1062
       +
       +                    lib.setFileName(QLatin1String(NIXPKGS_MESA_GL));

     

       1063
       1063
       +
       +                }

     

       1064
       1064
       +
       +#endif // NIXPKGS_MESA_GL

     

       1065
       1065
       +
                        glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");

     

       1066
       1066
       +
        #endif

     

       1067
       1067
       +
                    }

     

       1068
       1068
       +
       diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp

     

       1069
       1069
       +
       index da63360333..95e34e2e50 100644

     

       1070
       1070
       +
       --- a/src/plugins/platforms/xcb/qxcbcursor.cpp

     

       1071
       1071
       +
       +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp

     

       1072
       1072
       +
       @@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)

     

       1073
       1073
       +
        #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)

     

       1074
       1074
       +
            static bool function_ptrs_not_initialized = true;

     

       1075
       1075
       +
            if (function_ptrs_not_initialized) {

     

       1076
       1076
       +
       -        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);

     

       1077
       1077
       +
       +        QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);

     

       1078
       1078
       +
                bool xcursorFound = xcursorLib.load();

     

       1079
       1079
       +
                if (!xcursorFound) { // try without the version number

     

       1080
       1080
       +
       -            xcursorLib.setFileName(QLatin1String("Xcursor"));

     

       1081
       1081
       +
       +            xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));

     

       1082
       1082
       +
                    xcursorFound = xcursorLib.load();

     

       1083
       1083
       +
                }

     

       1084
       1084
       +
                if (xcursorFound) {

     

       1085
       1085
       +
       diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp

     

       1086
       1086
       +
       index c4cd66c33b..b6f2691587 100644

     

       1087
       1087
       +
       --- a/src/plugins/platformthemes/gtk3/main.cpp

     

       1088
       1088
       +
       +++ b/src/plugins/platformthemes/gtk3/main.cpp

     

       1089
       1089
       +
       @@ -39,6 +39,7 @@

     

       1090
       1090
       +
        

     

       1091
       1091
       +
        #include <qpa/qplatformthemeplugin.h>

     

       1092
       1092
       +
        #include "qgtk3theme.h"

     

       1093
       1093
       +
       +#include <QFile>

     

       1094
       1094
       +
        

     

       1095
       1095
       +
        QT_BEGIN_NAMESPACE

     

       1096
       1096
       +
        

     

       1097
       1097
       +
       @@ -54,8 +55,22 @@ public:

     

       1098
       1098
       +
        QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params)

     

       1099
       1099
       +
        {

     

       1100
       1100
       +
            Q_UNUSED(params);

     

       1101
       1101
       +
       -    if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive))

     

       1102
       1102
       +
       +    if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) {

     

       1103
       1103
       +
       +

     

       1104
       1104
       +
       +#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS

     

       1105
       1105
       +
       +        QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');

     

       1106
       1106
       +
       +        XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS);

     

       1107
       1107
       +
       +        qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));

     

       1108
       1108
       +
       +#endif

     

       1109
       1109
       +
       +

     

       1110
       1110
       +
       +#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES

     

       1111
       1111
       +
       +        QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');

     

       1112
       1112
       +
       +        GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);

     

       1113
       1113
       +
       +        qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));

     

       1114
       1114
       +
       +#endif

     

       1115
       1115
       +
       +

     

       1116
       1116
       +
                return new QGtk3Theme;

     

       1117
       1117
       +
       +    }

     

       1118
       1118
       +
        

     

       1119
       1119
       +
            return 0;

     

       1120
       1120
       +
        }

     

       1121
       1121
       +
       diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       1122
       1122
       +
       index 99d87e2e46..a4eab2aa72 100644

     

       1123
       1123
       +
       --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       1124
       1124
       +
       +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       1125
       1125
       +
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)

     

       1126
       1126
       +
            add_executable(Qt5::uic IMPORTED)

     

       1127
       1127
       +
        

     

       1128
       1128
       +
        !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       1129
       1129
       +
       -    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")

     

       1130
       1130
       +
       +    set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")

     

       1131
       1131
       +
        !!ELSE

     

       1132
       1132
       +
            set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")

     

       1133
       1133
       +
        !!ENDIF

+33

pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch

···

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

     

       2
       2
       +
       index ee5b38717..bbccef8c4 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)

     

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

     

       7
       7
       +
            addImportPath(installImportsPath);

     

       8
       8
       +
        

     

       9
       9
       +
       +    // Add import paths derived from PATH

     

       10
       10
       +
       +    const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');

     

       11
       11
       +
       +    const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);

     

       12
       12
       +
       +    for (const QString &path: paths) {

     

       13
       13
       +
       +        if (!path.isEmpty()) {

     

       14
       14
       +
       +            addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));

     

       15
       15
       +
       +        }

     

       16
       16
       +
       +    }

     

       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");

     

       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

     

       24
       24
       +
       +++ b/tools/qmlcachegen/qmlcache.prf

     

       25
       25
       +
       @@ -44,7 +44,7 @@ defineReplace(qmlCacheOutputFileName) {

     

       26
       26
       +
        }

     

       27
       27
       +
        

     

       28
       28
       +
        qmlcacheinst.base = $$QMLCACHE_DESTDIR

     

       29
       29
       +
       -qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH

     

       30
       30
       +
       +qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH

     

       31
       31
       +
        qmlcacheinst.CONFIG = no_check_exist

     

       32
       32
       +
        

     

       33
       33
       +
        qmlcachegen.input = CACHEGEN_FILES

+13

pkgs/development/libraries/qt-5/5.10/qtscript.patch

···

       1
       1
       +
       diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h

     

       2
       2
       +
       index 1f6d25e..087c3fb 100644

     

       3
       3
       +
       --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h

     

       4
       4
       +
       +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h

     

       5
       5
       +
       @@ -81,7 +81,7 @@

     

       6
       6
       +
        #include <pthread.h>

     

       7
       7
       +
        #elif PLATFORM(GTK)

     

       8
       8
       +
        #include <wtf/gtk/GOwnPtr.h>

     

       9
       9
       +
       -typedef struct _GMutex GMutex;

     

       10
       10
       +
       +typedef union _GMutex GMutex;

     

       11
       11
       +
        typedef struct _GCond GCond;

     

       12
       12
       +
        #endif

     

       13
       13
       +

+22

pkgs/development/libraries/qt-5/5.10/qtserialport.patch

···

       1
       1
       +
       diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h

     

       2
       2
       +
       index af2dab2..8e17f64 100644

     

       3
       3
       +
       --- a/src/serialport/qtudev_p.h

     

       4
       4
       +
       +++ b/src/serialport/qtudev_p.h

     

       5
       5
       +
       @@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN

     

       6
       6
       +
        inline bool resolveSymbols(QLibrary *udevLibrary)

     

       7
       7
       +
        {

     

       8
       8
       +
            if (!udevLibrary->isLoaded()) {

     

       9
       9
       +
       +#ifdef NIXPKGS_LIBUDEV

     

       10
       10
       +
       +        udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);

     

       11
       11
       +
       +#else

     

       12
       12
       +
                udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);

     

       13
       13
       +
       +#endif

     

       14
       14
       +
                if (!udevLibrary->load()) {

     

       15
       15
       +
       +#ifdef NIXPKGS_LIBUDEV

     

       16
       16
       +
       +            udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);

     

       17
       17
       +
       +#else

     

       18
       18
       +
                    udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);

     

       19
       19
       +
       +#endif

     

       20
       20
       +
                    if (!udevLibrary->load()) {

     

       21
       21
       +
                        qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);

     

       22
       22
       +
                        return false;

+71

pkgs/development/libraries/qt-5/5.10/qttools.patch

···

       1
       1
       +
       diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in

     

       2
       2
       +
       index 3b97923a..63336bd5 100644

     

       3
       3
       +
       --- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in

     

       4
       4
       +
       +++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in

     

       5
       5
       +
       @@ -2,11 +2,10 @@

     

       6
       6
       +
        if (NOT TARGET Qt5::qcollectiongenerator)

     

       7
       7
       +
            add_executable(Qt5::qcollectiongenerator IMPORTED)

     

       8
       8
       +
        

     

       9
       9
       +
       -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       10
       10
       +
       -    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")

     

       11
       11
       +
       -!!ELSE

     

       12
       12
       +
            set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")

     

       13
       13
       +
       -!!ENDIF

     

       14
       14
       +
       +    if(NOT EXISTS \"${imported_location}\")

     

       15
       15
       +
       +        set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")

     

       16
       16
       +
       +    endif()

     

       17
       17
       +
            _qt5_Help_check_file_exists(${imported_location})

     

       18
       18
       +
        

     

       19
       19
       +
            set_target_properties(Qt5::qcollectiongenerator PROPERTIES

     

       20
       20
       +
       @@ -17,11 +16,7 @@ endif()

     

       21
       21
       +
        if (NOT TARGET Qt5::qhelpgenerator)

     

       22
       22
       +
            add_executable(Qt5::qhelpgenerator IMPORTED)

     

       23
       23
       +
        

     

       24
       24
       +
       -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       25
       25
       +
       -    set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")

     

       26
       26
       +
       -!!ELSE

     

       27
       27
       +
            set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")

     

       28
       28
       +
       -!!ENDIF

     

       29
       29
       +
            _qt5_Help_check_file_exists(${imported_location})

     

       30
       30
       +
        

     

       31
       31
       +
            set_target_properties(Qt5::qhelpgenerator PROPERTIES

     

       32
       32
       +
       diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in

     

       33
       33
       +
       index 4318b16f..d60db4ff 100644

     

       34
       34
       +
       --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in

     

       35
       35
       +
       +++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in

     

       36
       36
       +
       @@ -44,11 +44,7 @@ endmacro()

     

       37
       37
       +
        if (NOT TARGET Qt5::lrelease)

     

       38
       38
       +
            add_executable(Qt5::lrelease IMPORTED)

     

       39
       39
       +
        

     

       40
       40
       +
       -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       41
       41
       +
       -    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")

     

       42
       42
       +
       -!!ELSE

     

       43
       43
       +
            set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")

     

       44
       44
       +
       -!!ENDIF

     

       45
       45
       +
            _qt5_LinguistTools_check_file_exists(${imported_location})

     

       46
       46
       +
        

     

       47
       47
       +
            set_target_properties(Qt5::lrelease PROPERTIES

     

       48
       48
       +
       @@ -59,11 +55,7 @@ endif()

     

       49
       49
       +
        if (NOT TARGET Qt5::lupdate)

     

       50
       50
       +
            add_executable(Qt5::lupdate IMPORTED)

     

       51
       51
       +
        

     

       52
       52
       +
       -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       53
       53
       +
       -    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")

     

       54
       54
       +
       -!!ELSE

     

       55
       55
       +
            set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")

     

       56
       56
       +
       -!!ENDIF

     

       57
       57
       +
            _qt5_LinguistTools_check_file_exists(${imported_location})

     

       58
       58
       +
        

     

       59
       59
       +
            set_target_properties(Qt5::lupdate PROPERTIES

     

       60
       60
       +
       @@ -74,11 +66,7 @@ endif()

     

       61
       61
       +
        if (NOT TARGET Qt5::lconvert)

     

       62
       62
       +
            add_executable(Qt5::lconvert IMPORTED)

     

       63
       63
       +
        

     

       64
       64
       +
       -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)

     

       65
       65
       +
       -    set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")

     

       66
       66
       +
       -!!ELSE

     

       67
       67
       +
            set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")

     

       68
       68
       +
       -!!ENDIF

     

       69
       69
       +
            _qt5_LinguistTools_check_file_exists(${imported_location})

     

       70
       70
       +
        

     

       71
       71
       +
            set_target_properties(Qt5::lconvert PROPERTIES

+48

pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch

···

       1
       1
       +
       diff --git a/src/3rdparty/chromium/v8/src/v8.gyp b/chromium/v8/src/v8.gyp

     

       2
       2
       +
       index e7e19f5059..934448c7d8 100644

     

       3
       3
       +
       --- a/src/3rdparty/chromium/v8/src/v8.gyp

     

       4
       4
       +
       +++ b/src/3rdparty/chromium/v8/src/v8.gyp

     

       5
       5
       +
       @@ -35,6 +35,7 @@

     

       6
       6
       +
            'v8_extra_library_files%': [],

     

       7
       7
       +
            'v8_experimental_extra_library_files%': [],

     

       8
       8
       +
            'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',

     

       9
       9
       +
       +    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',

     

       10
       10
       +
            'v8_os_page_size%': 0,

     

       11
       11
       +
          },

     

       12
       12
       +
          'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi', 'inspector/inspector.gypi'],

     

       13
       13
       +
       @@ -2576,7 +2577,7 @@

     

       14
       14
       +
                ]

     

       15
       15
       +
            },

     

       16
       16
       +
            {

     

       17
       17
       +
       -      'target_name': 'mksnapshot',

     

       18
       18
       +
       +      'target_name': 'mksnapshot_u',

     

       19
       19
       +
              'type': 'executable',

     

       20
       20
       +
              'dependencies': [

     

       21
       21
       +
                'v8_base',

     

       22
       22
       +
       @@ -2606,5 +2607,26 @@

     

       23
       23
       +
                }],

     

       24
       24
       +
              ],

     

       25
       25
       +
            },

     

       26
       26
       +
       +    {

     

       27
       27
       +
       +      'target_name': 'mksnapshot',

     

       28
       28
       +
       +      'type': 'executable',

     

       29
       29
       +
       +      'dependencies': ['mksnapshot_u'],

     

       30
       30
       +
       +      'actions': [

     

       31
       31
       +
       +        {

     

       32
       32
       +
       +          'action_name': 'paxmark_m_mksnapshot',

     

       33
       33
       +
       +          'inputs': [

     

       34
       34
       +
       +            '<(mksnapshot_u_exec)',

     

       35
       35
       +
       +          ],

     

       36
       36
       +
       +          'outputs': [

     

       37
       37
       +
       +            '<(mksnapshot_exec)',

     

       38
       38
       +
       +          ],

     

       39
       39
       +
       +          'action': [

     

       40
       40
       +
       +            'sh',

     

       41
       41
       +
       +            '-c',

     

       42
       42
       +
       +            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)',

     

       43
       43
       +
       +          ],

     

       44
       44
       +
       +        },

     

       45
       45
       +
       +      ],

     

       46
       46
       +
       +    },

     

       47
       47
       +
          ],

     

       48
       48
       +
        }

+77

pkgs/development/libraries/qt-5/5.10/qtwebkit.patch

···

       1
       1
       +
       diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri

     

       2
       2
       +
       index 69e4cd1f3..3f729a75e 100644

     

       3
       3
       +
       --- a/Source/WTF/WTF.pri

     

       4
       4
       +
       +++ b/Source/WTF/WTF.pri

     

       5
       5
       +
       @@ -12,7 +12,7 @@ mac {

     

       6
       6
       +
            # Mac OS does ship libicu but not the associated header files.

     

       7
       7
       +
            # Therefore WebKit provides adequate header files.

     

       8
       8
       +
            INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH

     

       9
       9
       +
       -    LIBS += -licucore

     

       10
       10
       +
       +    LIBS += /usr/lib/libicucore.dylib

     

       11
       11
       +
        } else:!use?(wchar_unicode): {

     

       12
       12
       +
            win32 {

     

       13
       13
       +
                CONFIG(static, static|shared) {

     

       14
       14
       +
       diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp

     

       15
       15
       +
       index a923d49aa..46772a4bb 100644

     

       16
       16
       +
       --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp

     

       17
       17
       +
       +++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp

     

       18
       18
       +
       @@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0)

     

       19
       19
       +
                }

     

       20
       20
       +
            }

     

       21
       21
       +
        

     

       22
       22
       +
       +#ifdef NIXPKGS_LIBGTK2

     

       23
       23
       +
       +    QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);

     

       24
       24
       +
       +#else

     

       25
       25
       +
            QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);

     

       26
       26
       +
       +#endif

     

       27
       27
       +
            if (library.load()) {

     

       28
       28
       +
                typedef void *(*gtk_init_check_ptr)(int*, char***);

     

       29
       29
       +
                gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");

     

       30
       30
       +
       diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp

     

       31
       31
       +
       index de06a2fea..86fe39ef1 100644

     

       32
       32
       +
       --- a/Source/WebCore/plugins/qt/PluginViewQt.cpp

     

       33
       33
       +
       +++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp

     

       34
       34
       +
       @@ -697,7 +697,11 @@ static Display *getPluginDisplay()

     

       35
       35
       +
            // support gdk based plugins (like flash) that use a different X connection.

     

       36
       36
       +
            // The code below has the same effect as this one:

     

       37
       37
       +
            // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());

     

       38
       38
       +
       +#ifdef NIXPKGS_LIBGDK2

     

       39
       39
       +
       +    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);

     

       40
       40
       +
       +#else

     

       41
       41
       +
            QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);

     

       42
       42
       +
       +#endif

     

       43
       43
       +
            if (!library.load())

     

       44
       44
       +
                return 0;

     

       45
       45
       +
        

     

       46
       46
       +
       diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp

     

       47
       47
       +
       index 8de65216b..38f5c05e5 100644

     

       48
       48
       +
       --- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp

     

       49
       49
       +
       +++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp

     

       50
       50
       +
       @@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr

     

       51
       51
       +
        

     

       52
       52
       +
        static bool initializeGtk()

     

       53
       53
       +
        {

     

       54
       54
       +
       +#ifdef NIXPKGS_LIBGTK2

     

       55
       55
       +
       +    QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);

     

       56
       56
       +
       +#else

     

       57
       57
       +
            QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);

     

       58
       58
       +
       +#endif

     

       59
       59
       +
            if (!gtkLibrary.load())

     

       60
       60
       +
                return false;

     

       61
       61
       +
            typedef void* (*gtk_init_ptr)(void*, void*);

     

       62
       62
       +
       diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

     

       63
       63
       +
       index d734ff684..0f6ff63d1 100644

     

       64
       64
       +
       --- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

     

       65
       65
       +
       +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

     

       66
       66
       +
       @@ -64,7 +64,11 @@ static Display* getPluginDisplay()

     

       67
       67
       +
            // The code below has the same effect as this one:

     

       68
       68
       +
            // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());

     

       69
       69
       +
        

     

       70
       70
       +
       +#ifdef NIXPKGS_LIBGDK2

     

       71
       71
       +
       +    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);

     

       72
       72
       +
       +#else

     

       73
       73
       +
            QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);

     

       74
       74
       +
       +#endif

     

       75
       75
       +
            if (!library.load())

     

       76
       76
       +
                return 0;

     

       77
       77
       +

+341

pkgs/development/libraries/qt-5/5.10/srcs.nix

···

       1
       1
       +
       # DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh

     

       2
       2
       +
       { fetchurl, mirror }:

     

       3
       3
       +
       

     

       4
       4
       +
       {

     

       5
       5
       +
         qt3d = {

     

       6
       6
       +
           version = "5.10.0";

     

       7
       7
       +
           src = fetchurl {

     

       8
       8
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qt3d-everywhere-src-5.10.0.tar.xz";

     

       9
       9
       +
             sha256 = "1arlplfpqdk0qki7bs1pp16y9cwa0awn071p551jg4y74xr7wi8j";

     

       10
       10
       +
             name = "qt3d-everywhere-src-5.10.0.tar.xz";

     

       11
       11
       +
           };

     

       12
       12
       +
         };

     

       13
       13
       +
         qtactiveqt = {

     

       14
       14
       +
           version = "5.10.0";

     

       15
       15
       +
           src = fetchurl {

     

       16
       16
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtactiveqt-everywhere-src-5.10.0.tar.xz";

     

       17
       17
       +
             sha256 = "0x6nbi5hlbr1pncbd8zzkwmqi04gcy64q3bjy5w45rg6zws41mzr";

     

       18
       18
       +
             name = "qtactiveqt-everywhere-src-5.10.0.tar.xz";

     

       19
       19
       +
           };

     

       20
       20
       +
         };

     

       21
       21
       +
         qtandroidextras = {

     

       22
       22
       +
           version = "5.10.0";

     

       23
       23
       +
           src = fetchurl {

     

       24
       24
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtandroidextras-everywhere-src-5.10.0.tar.xz";

     

       25
       25
       +
             sha256 = "1ifb49px86abaf4znmlis9wyyxq132nlgj3fyqppbx1sranikygk";

     

       26
       26
       +
             name = "qtandroidextras-everywhere-src-5.10.0.tar.xz";

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
         qtbase = {

     

       30
       30
       +
           version = "5.10.0";

     

       31
       31
       +
           src = fetchurl {

     

       32
       32
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtbase-everywhere-src-5.10.0.tar.xz";

     

       33
       33
       +
             sha256 = "0qpp56cbw1sfz5ayhj2mskb07cl6jd1ijayg29y624qa6b6phmgx";

     

       34
       34
       +
             name = "qtbase-everywhere-src-5.10.0.tar.xz";

     

       35
       35
       +
           };

     

       36
       36
       +
         };

     

       37
       37
       +
         qtcanvas3d = {

     

       38
       38
       +
           version = "5.10.0";

     

       39
       39
       +
           src = fetchurl {

     

       40
       40
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcanvas3d-everywhere-src-5.10.0.tar.xz";

     

       41
       41
       +
             sha256 = "11r98mdxy833kcnywlsjrfaqhax7m3b6yhb56072qvr30rpn52fj";

     

       42
       42
       +
             name = "qtcanvas3d-everywhere-src-5.10.0.tar.xz";

     

       43
       43
       +
           };

     

       44
       44
       +
         };

     

       45
       45
       +
         qtcharts = {

     

       46
       46
       +
           version = "5.10.0";

     

       47
       47
       +
           src = fetchurl {

     

       48
       48
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcharts-everywhere-src-5.10.0.tar.xz";

     

       49
       49
       +
             sha256 = "1vri3f7wyg84w6j84452g8h2p7sk7k01r0xszpn4klv7hi52rkhj";

     

       50
       50
       +
             name = "qtcharts-everywhere-src-5.10.0.tar.xz";

     

       51
       51
       +
           };

     

       52
       52
       +
         };

     

       53
       53
       +
         qtconnectivity = {

     

       54
       54
       +
           version = "5.10.0";

     

       55
       55
       +
           src = fetchurl {

     

       56
       56
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtconnectivity-everywhere-src-5.10.0.tar.xz";

     

       57
       57
       +
             sha256 = "19k9n6gzrbg0sbgyhhcl5gv0d4b2gjwmz5966gn6b424fblf4grf";

     

       58
       58
       +
             name = "qtconnectivity-everywhere-src-5.10.0.tar.xz";

     

       59
       59
       +
           };

     

       60
       60
       +
         };

     

       61
       61
       +
         qtdatavis3d = {

     

       62
       62
       +
           version = "5.10.0";

     

       63
       63
       +
           src = fetchurl {

     

       64
       64
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdatavis3d-everywhere-src-5.10.0.tar.xz";

     

       65
       65
       +
             sha256 = "06363x449k7wkqrd7c0y6b5vqlpwssnkl0g5s1bhp8lkl3bw81lj";

     

       66
       66
       +
             name = "qtdatavis3d-everywhere-src-5.10.0.tar.xz";

     

       67
       67
       +
           };

     

       68
       68
       +
         };

     

       69
       69
       +
         qtdeclarative = {

     

       70
       70
       +
           version = "5.10.0";

     

       71
       71
       +
           src = fetchurl {

     

       72
       72
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdeclarative-everywhere-src-5.10.0.tar.xz";

     

       73
       73
       +
             sha256 = "07kicxzbwiqwkg1x2k6447rwzvzn31cv1yyggc1m8r84lny4vjsw";

     

       74
       74
       +
             name = "qtdeclarative-everywhere-src-5.10.0.tar.xz";

     

       75
       75
       +
           };

     

       76
       76
       +
         };

     

       77
       77
       +
         qtdoc = {

     

       78
       78
       +
           version = "5.10.0";

     

       79
       79
       +
           src = fetchurl {

     

       80
       80
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdoc-everywhere-src-5.10.0.tar.xz";

     

       81
       81
       +
             sha256 = "01z4ikqrnnx9mzf5pvk4i2lqks4xai32fs9qqbqnsp0qrrcb1jfn";

     

       82
       82
       +
             name = "qtdoc-everywhere-src-5.10.0.tar.xz";

     

       83
       83
       +
           };

     

       84
       84
       +
         };

     

       85
       85
       +
         qtgamepad = {

     

       86
       86
       +
           version = "5.10.0";

     

       87
       87
       +
           src = fetchurl {

     

       88
       88
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgamepad-everywhere-src-5.10.0.tar.xz";

     

       89
       89
       +
             sha256 = "1rl77rsfgs69cdv75nfjp9w66mndwi211wix5cwl46d7i3wm0xak";

     

       90
       90
       +
             name = "qtgamepad-everywhere-src-5.10.0.tar.xz";

     

       91
       91
       +
           };

     

       92
       92
       +
         };

     

       93
       93
       +
         qtgraphicaleffects = {

     

       94
       94
       +
           version = "5.10.0";

     

       95
       95
       +
           src = fetchurl {

     

       96
       96
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgraphicaleffects-everywhere-src-5.10.0.tar.xz";

     

       97
       97
       +
             sha256 = "0c2y0ixxncn5xslpxciigq1gfaxd3n7wkcf14k4iy5i15w8nkfcp";

     

       98
       98
       +
             name = "qtgraphicaleffects-everywhere-src-5.10.0.tar.xz";

     

       99
       99
       +
           };

     

       100
       100
       +
         };

     

       101
       101
       +
         qtimageformats = {

     

       102
       102
       +
           version = "5.10.0";

     

       103
       103
       +
           src = fetchurl {

     

       104
       104
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtimageformats-everywhere-src-5.10.0.tar.xz";

     

       105
       105
       +
             sha256 = "1z7lnw85apzf6ph3dgnbb6py17qzpgww92kz31n6vbv5z62bigwi";

     

       106
       106
       +
             name = "qtimageformats-everywhere-src-5.10.0.tar.xz";

     

       107
       107
       +
           };

     

       108
       108
       +
         };

     

       109
       109
       +
         qtlocation = {

     

       110
       110
       +
           version = "5.10.0";

     

       111
       111
       +
           src = fetchurl {

     

       112
       112
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtlocation-everywhere-src-5.10.0.tar.xz";

     

       113
       113
       +
             sha256 = "1iw5m9v5p6l6mivjvj7g1macpqf2n21mg4wg0hza36dwrz3wwkfq";

     

       114
       114
       +
             name = "qtlocation-everywhere-src-5.10.0.tar.xz";

     

       115
       115
       +
           };

     

       116
       116
       +
         };

     

       117
       117
       +
         qtmacextras = {

     

       118
       118
       +
           version = "5.10.0";

     

       119
       119
       +
           src = fetchurl {

     

       120
       120
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmacextras-everywhere-src-5.10.0.tar.xz";

     

       121
       121
       +
             sha256 = "08n8na36j9c15hvicqfs7h915m2av5xd5v0azf7660z0q9lk9zb3";

     

       122
       122
       +
             name = "qtmacextras-everywhere-src-5.10.0.tar.xz";

     

       123
       123
       +
           };

     

       124
       124
       +
         };

     

       125
       125
       +
         qtmultimedia = {

     

       126
       126
       +
           version = "5.10.0";

     

       127
       127
       +
           src = fetchurl {

     

       128
       128
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmultimedia-everywhere-src-5.10.0.tar.xz";

     

       129
       129
       +
             sha256 = "0vw0i5jgn4q63g5ijwwrb6835qdaxcw7sfcjffbqfbdwqgyk70q0";

     

       130
       130
       +
             name = "qtmultimedia-everywhere-src-5.10.0.tar.xz";

     

       131
       131
       +
           };

     

       132
       132
       +
         };

     

       133
       133
       +
         qtnetworkauth = {

     

       134
       134
       +
           version = "5.10.0";

     

       135
       135
       +
           src = fetchurl {

     

       136
       136
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtnetworkauth-everywhere-src-5.10.0.tar.xz";

     

       137
       137
       +
             sha256 = "1lnqi1qpy9j5pi2lcmdihf81lspxv6hgdg5jmbqqdqxwzblgpnpc";

     

       138
       138
       +
             name = "qtnetworkauth-everywhere-src-5.10.0.tar.xz";

     

       139
       139
       +
           };

     

       140
       140
       +
         };

     

       141
       141
       +
         qtpurchasing = {

     

       142
       142
       +
           version = "5.10.0";

     

       143
       143
       +
           src = fetchurl {

     

       144
       144
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtpurchasing-everywhere-src-5.10.0.tar.xz";

     

       145
       145
       +
             sha256 = "0mkxslc8qc6sclpngllby3bb86qq5csrsz0xrc14nwmbkhwksxwc";

     

       146
       146
       +
             name = "qtpurchasing-everywhere-src-5.10.0.tar.xz";

     

       147
       147
       +
           };

     

       148
       148
       +
         };

     

       149
       149
       +
         qtquickcontrols = {

     

       150
       150
       +
           version = "5.10.0";

     

       151
       151
       +
           src = fetchurl {

     

       152
       152
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols-everywhere-src-5.10.0.tar.xz";

     

       153
       153
       +
             sha256 = "0ab19raip9828br21qqaglr4y0kqmxix882r13sfxlnm4ivyycx1";

     

       154
       154
       +
             name = "qtquickcontrols-everywhere-src-5.10.0.tar.xz";

     

       155
       155
       +
           };

     

       156
       156
       +
         };

     

       157
       157
       +
         qtquickcontrols2 = {

     

       158
       158
       +
           version = "5.10.0";

     

       159
       159
       +
           src = fetchurl {

     

       160
       160
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols2-everywhere-src-5.10.0.tar.xz";

     

       161
       161
       +
             sha256 = "18d1b5aivaqgs1px61glkyclkky60xd7yzy1vwa1f89sg8j711w1";

     

       162
       162
       +
             name = "qtquickcontrols2-everywhere-src-5.10.0.tar.xz";

     

       163
       163
       +
           };

     

       164
       164
       +
         };

     

       165
       165
       +
         qtremoteobjects = {

     

       166
       166
       +
           version = "5.10.0";

     

       167
       167
       +
           src = fetchurl {

     

       168
       168
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtremoteobjects-everywhere-src-5.10.0.tar.xz";

     

       169
       169
       +
             sha256 = "01bf1ykqxb4d8wz58vxy15yj4jsaqhi258k05dhy7ygdvfgscdnz";

     

       170
       170
       +
             name = "qtremoteobjects-everywhere-src-5.10.0.tar.xz";

     

       171
       171
       +
           };

     

       172
       172
       +
         };

     

       173
       173
       +
         qtscript = {

     

       174
       174
       +
           version = "5.10.0";

     

       175
       175
       +
           src = fetchurl {

     

       176
       176
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscript-everywhere-src-5.10.0.tar.xz";

     

       177
       177
       +
             sha256 = "1z6a14x9yj0p2znc0vny8y4zkdvm5fp42rnisnf9rynakkqg5wkc";

     

       178
       178
       +
             name = "qtscript-everywhere-src-5.10.0.tar.xz";

     

       179
       179
       +
           };

     

       180
       180
       +
         };

     

       181
       181
       +
         qtscxml = {

     

       182
       182
       +
           version = "5.10.0";

     

       183
       183
       +
           src = fetchurl {

     

       184
       184
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscxml-everywhere-src-5.10.0.tar.xz";

     

       185
       185
       +
             sha256 = "142qysd5s706r62gap62s89xm7334i1ys29dqsp09av9n7b1kfsb";

     

       186
       186
       +
             name = "qtscxml-everywhere-src-5.10.0.tar.xz";

     

       187
       187
       +
           };

     

       188
       188
       +
         };

     

       189
       189
       +
         qtsensors = {

     

       190
       190
       +
           version = "5.10.0";

     

       191
       191
       +
           src = fetchurl {

     

       192
       192
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsensors-everywhere-src-5.10.0.tar.xz";

     

       193
       193
       +
             sha256 = "0w9rzqc0hva4521i5j298lrsvys3jqddmqd80cxj9nsvnapwb66d";

     

       194
       194
       +
             name = "qtsensors-everywhere-src-5.10.0.tar.xz";

     

       195
       195
       +
           };

     

       196
       196
       +
         };

     

       197
       197
       +
         qtserialbus = {

     

       198
       198
       +
           version = "5.10.0";

     

       199
       199
       +
           src = fetchurl {

     

       200
       200
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialbus-everywhere-src-5.10.0.tar.xz";

     

       201
       201
       +
             sha256 = "06rr0191zy5yxqzxiv0c6dvshncjg8kdc33lszk41pajv624fn9z";

     

       202
       202
       +
             name = "qtserialbus-everywhere-src-5.10.0.tar.xz";

     

       203
       203
       +
           };

     

       204
       204
       +
         };

     

       205
       205
       +
         qtserialport = {

     

       206
       206
       +
           version = "5.10.0";

     

       207
       207
       +
           src = fetchurl {

     

       208
       208
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialport-everywhere-src-5.10.0.tar.xz";

     

       209
       209
       +
             sha256 = "0mqlhdp20jl6agv58mszznsikmi1dflhalkpfbgpiafjzzczx075";

     

       210
       210
       +
             name = "qtserialport-everywhere-src-5.10.0.tar.xz";

     

       211
       211
       +
           };

     

       212
       212
       +
         };

     

       213
       213
       +
         qtspeech = {

     

       214
       214
       +
           version = "5.10.0";

     

       215
       215
       +
           src = fetchurl {

     

       216
       216
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtspeech-everywhere-src-5.10.0.tar.xz";

     

       217
       217
       +
             sha256 = "1hashidb33f1215f0azjby1lh8iw7v2bvxp08mqvdk02jld9w5br";

     

       218
       218
       +
             name = "qtspeech-everywhere-src-5.10.0.tar.xz";

     

       219
       219
       +
           };

     

       220
       220
       +
         };

     

       221
       221
       +
         qtsvg = {

     

       222
       222
       +
           version = "5.10.0";

     

       223
       223
       +
           src = fetchurl {

     

       224
       224
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsvg-everywhere-src-5.10.0.tar.xz";

     

       225
       225
       +
             sha256 = "1c77wnpzjz4wwic5if876y5v1n44v2g2nhjmcs25cc8awz5afaja";

     

       226
       226
       +
             name = "qtsvg-everywhere-src-5.10.0.tar.xz";

     

       227
       227
       +
           };

     

       228
       228
       +
         };

     

       229
       229
       +
         qttools = {

     

       230
       230
       +
           version = "5.10.0";

     

       231
       231
       +
           src = fetchurl {

     

       232
       232
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttools-everywhere-src-5.10.0.tar.xz";

     

       233
       233
       +
             sha256 = "0cpybii2yznk6gwaa2cz83rk3cpzzm6l4wvn4n2xwdbrgdsdrx8z";

     

       234
       234
       +
             name = "qttools-everywhere-src-5.10.0.tar.xz";

     

       235
       235
       +
           };

     

       236
       236
       +
         };

     

       237
       237
       +
         qttranslations = {

     

       238
       238
       +
           version = "5.10.0";

     

       239
       239
       +
           src = fetchurl {

     

       240
       240
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttranslations-everywhere-src-5.10.0.tar.xz";

     

       241
       241
       +
             sha256 = "1gmrisf08nsrni7fyjlz5ggfgfzzkjpq3g7l2hc6vq5g04vbskgc";

     

       242
       242
       +
             name = "qttranslations-everywhere-src-5.10.0.tar.xz";

     

       243
       243
       +
           };

     

       244
       244
       +
         };

     

       245
       245
       +
         qtvirtualkeyboard = {

     

       246
       246
       +
           version = "5.10.0";

     

       247
       247
       +
           src = fetchurl {

     

       248
       248
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz";

     

       249
       249
       +
             sha256 = "0mqb9sgvq7djd2lz4q4p6p9f0c23cfhk447zx4axvv1mldjxsb9c";

     

       250
       250
       +
             name = "qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz";

     

       251
       251
       +
           };

     

       252
       252
       +
         };

     

       253
       253
       +
         qtwayland = {

     

       254
       254
       +
           version = "5.10.0";

     

       255
       255
       +
           src = fetchurl {

     

       256
       256
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwayland-everywhere-src-5.10.0.tar.xz";

     

       257
       257
       +
             sha256 = "14sb0227rzqzf5z8dz8b9nzkk5rwq6hrfxifz603iy4mdijzjmsn";

     

       258
       258
       +
             name = "qtwayland-everywhere-src-5.10.0.tar.xz";

     

       259
       259
       +
           };

     

       260
       260
       +
         };

     

       261
       261
       +
         qtwebchannel = {

     

       262
       262
       +
           version = "5.10.0";

     

       263
       263
       +
           src = fetchurl {

     

       264
       264
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebchannel-everywhere-src-5.10.0.tar.xz";

     

       265
       265
       +
             sha256 = "18rml5xyb9chz8wrfamsgx4z32kkjbk1rc47ynvhn49mcbf2897j";

     

       266
       266
       +
             name = "qtwebchannel-everywhere-src-5.10.0.tar.xz";

     

       267
       267
       +
           };

     

       268
       268
       +
         };

     

       269
       269
       +
         qtwebengine = {

     

       270
       270
       +
           version = "5.10.0";

     

       271
       271
       +
           src = fetchurl {

     

       272
       272
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebengine-everywhere-src-5.10.0.tar.xz";

     

       273
       273
       +
             sha256 = "1yb7jpydxg0dwdrx0iv7i5dq4wb9ld1iff8zpjdj8yl4xy4mkgx8";

     

       274
       274
       +
             name = "qtwebengine-everywhere-src-5.10.0.tar.xz";

     

       275
       275
       +
           };

     

       276
       276
       +
         };

     

       277
       277
       +
         qtwebglplugin = {

     

       278
       278
       +
           version = "5.10.0";

     

       279
       279
       +
           src = fetchurl {

     

       280
       280
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebglplugin-everywhere-src-5.10.0.tar.xz";

     

       281
       281
       +
             sha256 = "0hgwb5lll3275knnj3ms04y1n0i6gph9kac2246ixmcq8sc7a2k7";

     

       282
       282
       +
             name = "qtwebglplugin-everywhere-src-5.10.0.tar.xz";

     

       283
       283
       +
           };

     

       284
       284
       +
         };

     

       285
       285
       +
         qtwebsockets = {

     

       286
       286
       +
           version = "5.10.0";

     

       287
       287
       +
           src = fetchurl {

     

       288
       288
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebsockets-everywhere-src-5.10.0.tar.xz";

     

       289
       289
       +
             sha256 = "00wlyhw7h2axyhinksfm912jfa3n73szxdccz5dlir8742i0zaqp";

     

       290
       290
       +
             name = "qtwebsockets-everywhere-src-5.10.0.tar.xz";

     

       291
       291
       +
           };

     

       292
       292
       +
         };

     

       293
       293
       +
         qtwebview = {

     

       294
       294
       +
           version = "5.10.0";

     

       295
       295
       +
           src = fetchurl {

     

       296
       296
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebview-everywhere-src-5.10.0.tar.xz";

     

       297
       297
       +
             sha256 = "1955fkc7a22d7a0y2n7kz7r1md56v2s5qvyb3h68szs60zjnk3xa";

     

       298
       298
       +
             name = "qtwebview-everywhere-src-5.10.0.tar.xz";

     

       299
       299
       +
           };

     

       300
       300
       +
         };

     

       301
       301
       +
         qtwinextras = {

     

       302
       302
       +
           version = "5.10.0";

     

       303
       303
       +
           src = fetchurl {

     

       304
       304
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwinextras-everywhere-src-5.10.0.tar.xz";

     

       305
       305
       +
             sha256 = "1mx5qihmh3awqcr9k3z2chxz8273bi5ha90v7f4fqr2vk3g6w4yd";

     

       306
       306
       +
             name = "qtwinextras-everywhere-src-5.10.0.tar.xz";

     

       307
       307
       +
           };

     

       308
       308
       +
         };

     

       309
       309
       +
         qtx11extras = {

     

       310
       310
       +
           version = "5.10.0";

     

       311
       311
       +
           src = fetchurl {

     

       312
       312
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtx11extras-everywhere-src-5.10.0.tar.xz";

     

       313
       313
       +
             sha256 = "11jp0a40jqwcdq7isyip4f4mq2d58c9fx1kvg9g71m92n52ffyfb";

     

       314
       314
       +
             name = "qtx11extras-everywhere-src-5.10.0.tar.xz";

     

       315
       315
       +
           };

     

       316
       316
       +
         };

     

       317
       317
       +
         qtxmlpatterns = {

     

       318
       318
       +
           version = "5.10.0";

     

       319
       319
       +
           src = fetchurl {

     

       320
       320
       +
             url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtxmlpatterns-everywhere-src-5.10.0.tar.xz";

     

       321
       321
       +
             sha256 = "1hq3sbimbhaiw570d2cd84jhki0n2jw2x2s7iq92m53y4akbr2mh";

     

       322
       322
       +
             name = "qtxmlpatterns-everywhere-src-5.10.0.tar.xz";

     

       323
       323
       +
           };

     

       324
       324
       +
         };

     

       325
       325
       +
         qtwebkit = {

     

       326
       326
       +
           version = "5.9.1";

     

       327
       327
       +
           src = fetchurl {

     

       328
       328
       +
             url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz";

     

       329
       329
       +
             sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998";

     

       330
       330
       +
             name = "qtwebkit-opensource-src-5.9.1.tar.xz";

     

       331
       331
       +
           };

     

       332
       332
       +
         };

     

       333
       333
       +
         qtwebkit-examples = {

     

       334
       334
       +
           version = "5.9.1";

     

       335
       335
       +
           src = fetchurl {

     

       336
       336
       +
             url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz";

     

       337
       337
       +
             sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4";

     

       338
       338
       +
             name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz";

     

       339
       339
       +
           };

     

       340
       340
       +
         };

     

       341
       341
       +
       }

+17 -2

pkgs/top-level/all-packages.nix

···

       10527
       10527
        
       

     

       10528
       10528
        
         libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5);

     

       10529
       10529
        
       

     

       10530
       10530
       -
         qt5 = qt59;

     

       10531
       10531
       -
         libsForQt5 = libsForQt59;

     

       10530
       10530
       +
         qt510 = recurseIntoAttrs (makeOverridable

     

       10531
       10531
       +
           (import ../development/libraries/qt-5/5.10) {

     

       10532
       10532
       +
             inherit newScope;

     

       10533
       10533
       +
             inherit stdenv fetchurl makeSetupHook makeWrapper;

     

       10534
       10534
       +
             bison = bison2; # error: too few arguments to function 'int yylex(...

     

       10535
       10535
       +
             inherit cups;

     

       10536
       10536
       +
             harfbuzz = harfbuzz-icu;

     

       10537
       10537
       +
             mesa = mesa_noglu;

     

       10538
       10538
       +
             inherit perl;

     

       10539
       10539
       +
             inherit (gst_all_1) gstreamer gst-plugins-base;

     

       10540
       10540
       +
             inherit (gnome3) gtk3 dconf;

     

       10541
       10541
       +
           });

     

       10542
       10542
       +
       

     

       10543
       10543
       +
         libsForQt510 = recurseIntoAttrs (lib.makeScope qt510.newScope mkLibsForQt5);

     

       10544
       10544
       +
       

     

       10545
       10545
       +
         qt5 = qt510;

     

       10546
       10546
       +
         libsForQt5 = libsForQt510;

     

       10532
       10547
        
       

     

       10533
       10548
        
         qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };

     

       10534
       10549