Add qt5 suffix for distros that doesn't symlink tools to non-qt5 names
This commit is contained in:
		@@ -21,7 +21,11 @@ unix:!macx {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Create the introspection XML
 | 
					# Create the introspection XML
 | 
				
			||||||
system(qdbuscpp2xml -M -s src/cli/headlessmanager.h -o org.qcma.HeadlessManager.xml)
 | 
					QT5_SUFFIX {
 | 
				
			||||||
 | 
					    system(qdbuscpp2xml-qt5 -M -s src/cli/headlessmanager.h -o org.qcma.HeadlessManager.xml)
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    system(qdbuscpp2xml -M -s src/cli/headlessmanager.h -o org.qcma.HeadlessManager.xml)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Create the helper class
 | 
					# Create the helper class
 | 
				
			||||||
DBUS_ADAPTORS = org.qcma.HeadlessManager.xml
 | 
					DBUS_ADAPTORS = org.qcma.HeadlessManager.xml
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,7 +71,11 @@ unix:!macx {
 | 
				
			|||||||
QT += dbus
 | 
					QT += dbus
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Create the introspection XML
 | 
					# Create the introspection XML
 | 
				
			||||||
system(qdbuscpp2xml -M -s src/gui/mainwidget.h -o org.qcma.ClientManager.xml)
 | 
					QT5_SUFFIX {
 | 
				
			||||||
 | 
					    system(qdbuscpp2xml-qt5 -M -s src/gui/mainwidget.h -o org.qcma.ClientManager.xml)
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    system(qdbuscpp2xml -M -s src/gui/mainwidget.h -o org.qcma.ClientManager.xml)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Create the helper class
 | 
					# Create the helper class
 | 
				
			||||||
DBUS_ADAPTORS = org.qcma.ClientManager.xml
 | 
					DBUS_ADAPTORS = org.qcma.ClientManager.xml
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@ cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version}
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
%build
 | 
					%build
 | 
				
			||||||
lrelease-qt5 resources/translations/*.ts
 | 
					lrelease-qt5 resources/translations/*.ts
 | 
				
			||||||
qmake-qt5 PREFIX=/usr qcma.pro
 | 
					qmake-qt5 PREFIX=/usr qcma.pro CONFIG+=QT5_SUFFIX
 | 
				
			||||||
make %{?_smp_mflags}
 | 
					make %{?_smp_mflags}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%install
 | 
					%install
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@ cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version}
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
%build
 | 
					%build
 | 
				
			||||||
lrelease-qt5 resources/translations/*.ts
 | 
					lrelease-qt5 resources/translations/*.ts
 | 
				
			||||||
qmake-qt5 PREFIX=/usr qcma.pro
 | 
					qmake-qt5 PREFIX=/usr qcma.pro CONFIG+=QT5_SUFFIX
 | 
				
			||||||
make %{?_smp_mflags}
 | 
					make %{?_smp_mflags}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%install
 | 
					%install
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user