• Tuomas Jormola's avatar
    Fix detection of moc for Qt5 · a766c55f
    Tuomas Jormola authored and Albert Astals Cid's avatar Albert Astals Cid committed
    Bug #72744
    On my Mac OS X 10.9 Mavericks system with Qt 5.2.0 installed using
    Homebrew, the output of the moc command doesn't include the string
    "Qt 5" which is expected by the moc version detection logic in
    configure.ac of poppler 0.24.4. This patch updates the grep pattern so
    that the current expected moc version output and the version output of
    this installation of Qt5 are both detected as a valid moc for Qt5. With
    this patch applied, I was able to build and test poppler with Qt5
    support successfully.
    (09:26:05)(tj@gauri)(~)$ uname -a
    Darwin gauri.ad.local.domain 13.0.0 Darwin Kernel Version 13.0.0: Thu Sep 19 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64 x86_64 i386 MacBookPro3,1 Darwin
    (09:26:08)(tj@gauri)(~)$ /usr/local/opt/qt5/bin/moc -v
    moc 5.2.0
configure.ac 28.9 KB