Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 5f020d562778
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a88146d308fb
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 29, 2017

  1. qt4: enable parallel building in the configure phase

    @orivej
    orivej committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    8b0ef2a View commit details
    Browse the repository at this point in the history

  2. qt4: fix parallel building of moc_qtgradientviewdialog.o 

    Previously the last of these commands:

```
make -j sub-tools-bootstrap
make -j sub-uic sub-moc sub-rcc
make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o
```

failed with this error:

```
In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0,
                 from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47,
                 from .moc/release-shared/moc_qtgradientviewdialog.cpp:9:
../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory
```

because uic did not ensure that the build of moc_qtgradientviewdialog.o happens
after the build of moc_qtgradientview.o.
    @orivej
    orivej committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    a88146d View commit details
    Browse the repository at this point in the history