diff options
| author | Christophe Grenier <[email protected]> | 2016-11-13 18:29:40 +0100 |
|---|---|---|
| committer | Christophe Grenier <[email protected]> | 2016-11-13 18:29:40 +0100 |
| commit | 96469ca6492f30f1000141e78383e008fb751216 (patch) | |
| tree | 7655dc669d580bdef59ee375a8f4c7b2be3525bf | |
| parent | f56ab1bdb22c27ac8433f1db651cf902b774551f (diff) | |
Fix compilation issue under Ubuntu by setting QT_SELECT to qt5
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c01a6a44..8f17de0e 100644 --- a/configure.ac +++ b/configure.ac @@ -898,6 +898,7 @@ AC_CHECK_FUNCS([reiserfs_fs_open_fast]) LIBS="$OLDLIBS" AC_CHECK_FUNCS([ntfs_libntfs_version ntfs_volume_startup]) +export QT_SELECT=qt5 if test "$use_qt" = "true"; then PKG_CHECK_MODULES(QTGUI, [Qt5Gui >= 5.0.0],,use_qt=false) @@ -989,6 +990,7 @@ AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(MOC) AC_SUBST(LRELEASE) +AC_SUBST(QT_SELECT) AC_SUBST(fidentify_LDADD) AC_SUBST(testdisk_LDADD) AC_SUBST(photorec_LDADD) diff --git a/src/Makefile.am b/src/Makefile.am index 9095a5ca..26530dba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -383,14 +383,14 @@ small: $(sbin_PROGRAMS) $(bin_PROGRAMS) extras: $(EXTRA_PROGRAMS) moc_qphotorec.cpp: qphotorec.h - $(AM_V_GEN) $(MOC) $< -o $@ + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $< -o $@ rcc_qphotorec.cpp: qphotorec.qrc - $(AM_V_GEN) $(RCC) $< -o $@ -name qphotorec + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $< -o $@ -name qphotorec rcc_qphotorec_locale.cpp: qphotorec_locale.qrc $(QT_QM) $(LN_S) $< $(@D) || exit 0 - $(AM_V_GEN) $(RCC) $(@D)/$(<F) -o $@ -name qphotorec_locale + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(@D)/$(<F) -o $@ -name qphotorec_locale Android.mk: Makefile.am androgenizer \ @@ -411,4 +411,4 @@ Android.mk: Makefile.am %.qm: %.ts $(MKDIR_P) $(@D) - $(AM_V_GEN) $(LRELEASE) -silent $< -qm $@ + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@ |