--- qsampler/trunk/src/src.pro 2015/08/12 16:57:14 2834 +++ qsampler/trunk/src/src.pro 2019/12/10 10:34:06 3648 @@ -10,6 +10,7 @@ #DEFINES += DEBUG HEADERS += config.h \ + qsampler.h \ qsamplerAbout.h \ qsamplerOptions.h \ qsamplerChannel.h \ @@ -28,6 +29,7 @@ qsamplerChannelForm.h \ qsamplerChannelFxForm.h \ qsamplerOptionsForm.h \ + qsamplerPaletteForm.h \ qsamplerMainForm.h SOURCES += \ @@ -49,6 +51,7 @@ qsamplerChannelForm.cpp \ qsamplerChannelFxForm.cpp \ qsamplerOptionsForm.cpp \ + qsamplerPaletteForm.cpp \ qsamplerMainForm.cpp FORMS += \ @@ -59,6 +62,7 @@ qsamplerChannelForm.ui \ qsamplerChannelFxForm.ui \ qsamplerOptionsForm.ui \ + qsamplerPaletteForm.ui \ qsamplerMainForm.ui RESOURCES += \ @@ -67,6 +71,7 @@ TRANSLATIONS += \ translations/qsampler_cs.ts \ + translations/qsampler_fr.ts \ translations/qsampler_ru.ts @@ -81,10 +86,15 @@ PREFIX = /usr/local } - BINDIR = $${PREFIX}/bin - DATADIR = $$PREFIX/share + isEmpty(BINDIR) { + BINDIR = $${PREFIX}/bin + } + + isEmpty(DATADIR) { + DATADIR = $${PREFIX}/share + } - DEFINES += DATADIR=\"$${DATADIR}\" + #DEFINES += DATADIR=\"$${DATADIR}\" # make install INSTALLS += target desktop icon appdata \ @@ -101,7 +111,7 @@ icon_scalable.path = $${DATADIR}/icons/hicolor/scalable/apps icon_scalable.files += images/$${NAME}.svg - appdata.path = $${DATADIR}/appdata + appdata.path = $${DATADIR}/metainfo appdata.files += appdata/$${NAME}.appdata.xml mimeinfo.path = $${DATADIR}/mime/packages @@ -114,6 +124,8 @@ mimetypes_scalable.files += mimetypes/application-x-$${NAME}-session.svg } +QT += widgets + win32 { CONFIG(debug, debug|release): CONFIG += console @@ -126,9 +138,3 @@ QMAKE_MAC_SDK = $$(SDKROOT) CONFIG += $$(QMAKE_ARCHS) } - - -# QT5 support -!lessThan(QT_MAJOR_VERSION, 5) { - QT += widgets -}