installation of programs fixed; closes #70

master
Marc Wäckerlin 14 years ago
parent 57bce10e86
commit c3bea2d94c
  1. 4
      swisssurfer/src/main.cxx
  2. 11
      swisssurfer/src/makefile.am

@ -15,10 +15,10 @@
#include <QtCore/QProcess>
#include <QtCore/QFileInfo>
#include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QSslConfiguration>
#include <QtNetwork/QSslCertificate>
#include <QtNetwork/QSslKey>
#include <QtWebKit/QWebSettings>
#include <browser.hxx>
#include <iostream>
@ -292,6 +292,8 @@ int main(int argv, char** argc) try {
#endif
#endif
;
QWebSettings::globalSettings()->setAttribute
(QWebSettings::PluginsEnabled, true);
bool silent(false);
bool login(false);
Settings::MimeTypes mimetypes;

@ -63,6 +63,17 @@ ${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.qm)
clean-local:
-rm -r ${QMAKE_TARGET}.app
maintainer-clean-local:
-rm -rf ${QMAKE_TARGET}.app
install-exec-local:
( test -f @PACKAGENAME@ && cp @PACKAGENAME@ ${bindir}/ ) \
|| ( test -f @PACKAGENAME@.exe && cp @PACKAGENAME@.exe ${bindir}/ ) \
|| ( test -d @PACKAGENAME@.app && cp -r @PACKAGENAME@.app ${bindir}/ )
uninstall-local:
-rm -rf ${bindir}/@PACKAGENAME@{,.exe,.app}
CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=@PACKAGENAME@_%.qm) \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
${QMAKE_TARGET} \

Loading…
Cancel
Save