diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-09-13 08:42:35 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-09-13 08:42:35 +0200 |
| commit | 7001f5e12b905077c9be86f48a6b526fe6fc93ef (patch) | |
| tree | ac12f83149349644ce9d7a98f4109f7ac37007a4 /config | |
| parent | 5ec92ab6b72041526fd69c625847d80de75815f0 (diff) | |
| download | MPC-7001f5e12b905077c9be86f48a6b526fe6fc93ef.tar.gz | |
Add support for QT5_SUFFIX, on some linux distributions the qt5 binaries have a -qt5 suffix
* config/qt5_core.mpb:
Diffstat (limited to 'config')
| -rw-r--r-- | config/qt5_core.mpb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config/qt5_core.mpb b/config/qt5_core.mpb index 7e7306af..08506084 100644 --- a/config/qt5_core.mpb +++ b/config/qt5_core.mpb @@ -11,6 +11,13 @@ project { $QT5_LIBDIR $(QTDIR)/lib } + // On some linux systems with both Qt4 and Qt5 installed, the uic and moc + // executables for Qt5 need to be run as "uic-qt5" + // Expand the variable here to avoid the "undefined" warning from msvc. + expand(QT5_SUFFIX) { + $QT5_SUFFIX + "" + } requires += qt5 includes += $(QT5_INCDIR) @@ -30,7 +37,7 @@ project { } Define_Custom(UIC) { - command = $(QT5_BINDIR)/uic + command = $(QT5_BINDIR)/uic$(QT5_SUFFIX) output_option = -o inputext = .ui pre_filename = ui_ @@ -40,7 +47,7 @@ project { Define_Custom(MOC) { automatic_in = 0 automatic_out = 0 - command = $(QT5_BINDIR)/moc + command = $(QT5_BINDIR)/moc$(QT5_SUFFIX) output_option = -o pch_postrule = 1 inputext = .h @@ -49,7 +56,7 @@ project { } Define_Custom(QRC) { - command = $(QT5_BINDIR)/rcc + command = $(QT5_BINDIR)/rcc$(QT5_SUFFIX) output_option = -o commandflags = -name <%input_noext%> pch_postrule = 1 |