libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

find all tools in same dir as moc; refs #40

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-05-05 12:23:59 +00:00
parent 8a04f708cb
commit dcab643014
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.in
View File

@@ -179,26 +179,28 @@ else
CPPFLAGS+=" -I$QTINCDIR" CPPFLAGS+=" -I$QTINCDIR"
AC_ARG_WITH([moc], AC_ARG_WITH([moc],
AC_HELP_STRING([--with-moc=/path/to/moc], AC_HELP_STRING([--with-moc=/path/to/moc],
[to specify the path to qt4 moc.]), [to specify the path to qt moc.]),
[MOC="$withval"], [MOC="$withval"],
[MOC=""]) [MOC=""])
AC_CHECK_PROGS([MOC], [$MOC moc-qt4 moc-mac moc]) AC_CHECK_PROGS([MOC], [$MOC moc moc-qt4 moc-mac])
test -n "$MOC" || AC_MSG_ERROR([moc for Qt 4 not found!]) test -n "$MOC" || AC_MSG_ERROR([moc for Qt not found!])
AC_SUBST(MOC) AC_SUBST(MOC)
AC_CHECK_PROGS([RCC], [rcc-qt4 rcc-mac rcc]) AC_CHECK_PROGS([RCC], [$(dirname $MOC)/rcc rcc rcc-qt4 rcc-mac])
test -n "$RCC" || AC_MSG_ERROR([rcc for Qt 4 not found!]) test -n "$RCC" || AC_MSG_ERROR([rcc for Qt not found!])
AC_SUBST(RCC) AC_SUBST(RCC)
AC_CHECK_PROGS([UIC], [uic-qt4 uic-mac uic]) AC_CHECK_PROGS([UIC], [$(dirname $MOC)/uic uic uic-qt4 uic-mac])
test -n "$UIC" || AC_MSG_ERROR([uic for Qt 4 not found!]) test -n "$UIC" || AC_MSG_ERROR([uic for Qt not found!])
AC_SUBST(UIC) AC_SUBST(UIC)
AC_CHECK_PROGS([LRELEASE], [lrelease-qt4 lrelease-mac lrelease]) AC_CHECK_PROGS([LRELEASE], [$(dirname $MOC)/lrelease lrelease lrelease-qt4 lrelease-mac])
test -n "$LRELEASE" || AC_MSG_ERROR([lrelease for Qt 4 not found!]) test -n "$LRELEASE" || AC_MSG_ERROR([lrelease for Qt not found!])
AC_SUBST(LRELEASE) AC_SUBST(LRELEASE)
AC_CHECK_PROGS([LUPDATE], [lupdate-qt4 lupdate-mac lupdate]) AC_CHECK_PROGS([LUPDATE], [$(dirname $MOC)/lupdate lupdate lupdate-qt4 lupdate-mac])
test -n "$LUPDATE" || AC_MSG_ERROR([lupdate for Qt 4 not found!]) test -n "$LUPDATE" || AC_MSG_ERROR([lupdate for Qt not found!])
AC_SUBST(LUPDATE) AC_SUBST(LUPDATE)
AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete]) AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete])
fi fi
DISTCHECK_CONFIGURE_FLAGS="$(env)"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
# create output # create output
AC_OUTPUT AC_OUTPUT

4
src/proxyface/proxy.hxx
View File

@@ -141,7 +141,7 @@ namespace gui {
public Q_SLOTS: public Q_SLOTS:
void proxyAuthenticationRequired(const QNetworkProxy& p, void proxyAuthenticationRequired(const QNetworkProxy&,
QAuthenticator* auth) { QAuthenticator* auth) {
qDebug()<<"proxyAuthenticationRequired"; qDebug()<<"proxyAuthenticationRequired";
_proxyAuth._realm->setText(auth->realm()); _proxyAuth._realm->setText(auth->realm());
@@ -154,7 +154,7 @@ namespace gui {
_auto.restart(); _auto.restart();
} }
void authenticationRequired(QNetworkReply*, QAuthenticator* auth) { void authenticationRequired(QNetworkReply*, QAuthenticator*) {
} }
void proxyFoundSlot(const QUrl&, const QNetworkProxy& p) { void proxyFoundSlot(const QUrl&, const QNetworkProxy& p) {