[git] Pinentry - branch, master, updated. pinentry-0.9.5-11-gabb59f5
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Jul 28 15:19:15 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".
The branch, master has been updated
via abb59f50abf698ff1e56490fb39bcc98c26ab44b (commit)
from 43f975bf0348663dc8b01737dee5b15244ef7ee8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit abb59f50abf698ff1e56490fb39bcc98c26ab44b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 28 14:45:45 2015 +0200
Qt4: Rename to pinentry-qt and add Qt5 Support
* qt4: Moved to qt.
* Makefile.am: Change qt4 suffix to qt.
* m4/qt.m4: Remove old qt lookup functions.
(FIND_QT): New. Use pkg-config to find either Qt5 or Qt4
* configure.ac: Change qt4 suffix to qt. Use new FIND_QT function.
* qt/Makefile.am: Change qt4 suffix to qt. Use new FLAGS / LIBS.
* qt/pinentrydialog.cpp, qt/qrc_pinentry.cpp: Fix whitespace.
* .gitignore: Change qt4 paths to qt.
* README: Update accordingly.
* autogen.rc: Change qt4 to qt.
* qt/main.cpp (qt_cmd_handler, main): Change qt4 to qt.
--
Now if Qt5 is found with pkg-config Qt5 is used. Qt4 is still
supported as a fallback in case Qt5 is not found.
GnuPG-bug-id: 1806
diff --git a/.gitignore b/.gitignore
index 92a9c2b..e9d3966 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,16 +26,16 @@ gnome3/Makefile.in
gnome3/Makefile
pinentry/Makefile.in
pinentry/Makefile
-qt4/Makefile.in
-qt4/Makefile
+qt/Makefile.in
+qt/Makefile
secmem/Makefile.in
secmem/Makefile
w32/Makefile.in
w32/Makefile
tty/Makefile.in
tty/Makefile
-/qt4/pinentryconfirm.moc
-/qt4/pinentrydialog.moc
-/qt4/qsecurelineedit.moc
+/qt/pinentryconfirm.moc
+/qt/pinentrydialog.moc
+/qt/qsecurelineedit.moc
/m4/Makefile.in
/emacs/Makefile.in
diff --git a/Makefile.am b/Makefile.am
index 22640df..7dcc0ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
-DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4
+DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt
GITLOG_TO_CHANGELOG=gitlog-to-changelog
@@ -58,10 +58,10 @@ else
pinentry_gnome_3 =
endif
-if BUILD_PINENTRY_QT4
-pinentry_qt4 = qt4
+if BUILD_PINENTRY_QT
+pinentry_qt = qt
else
-pinentry_qt4 =
+pinentry_qt =
endif
if BUILD_PINENTRY_W32
@@ -72,7 +72,7 @@ endif
SUBDIRS = m4 secmem pinentry ${pinentry_curses} ${pinentry_tty} \
${pinentry_emacs} ${pinentry_gtk_2} ${pinentry_gnome_3} \
- ${pinentry_qt4} ${pinentry_w32} doc
+ ${pinentry_qt} ${pinentry_w32} doc
install-exec-local:
diff --git a/README b/README
index d66d2d2..b80d466 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ GUI OPTION DEPENDENCIES
Curses --enable-pinentry-curses Curses library, for example ncurses
GTK+ V2.0 --enable-pinentry-gtk2 Gimp Toolkit Library, Version 2.0
eg. libgtk-x11-2.0 and libglib-2.0
-Qt4 --enable-pinentry-qt4 Qt4
+Qt --enable-pinentry-qt Qt (> 4.4.0)
TTY --enable-pinentry-tty Simple TTY version, no dependencies
The GTK+ and Qt pinentries can fall back to curses mode. The
@@ -26,11 +26,11 @@ pass --disable-fallback-curses to the configure script as well.
Examples:
* To only build the GTK+ pinentry with curses support:
./configure --enable-pinentry-gtk2 --enable-fallback-curses \
- --disable-pinentry-curses --disable-pinentry-qt4
+ --disable-pinentry-curses --disable-pinentry-qt
* To build the Qt pinentry, and the other pinentries if they are
supported:
-./configure --enable-pinentry-qt4
+./configure --enable-pinentry-qt
* To build everything that is supported (complete auto-detection):
./configure
diff --git a/autogen.rc b/autogen.rc
index bed429b..9be5e62 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -4,7 +4,7 @@
case "$myhost:$myhostsub" in
w32:ce)
- extraoptions="--disable-pinentry-gtk2 --disable-pinentry-qt4"
+ extraoptions="--disable-pinentry-gtk2 --disable-pinentry-qt"
;;
w32:)
extraoptions=""
diff --git a/configure.ac b/configure.ac
index f640a68..2ffea2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -503,11 +503,19 @@ AC_ARG_ENABLE(libsecret,
libsecret=$enableval, libsecret=maybe)
dnl check for pkg-config
-if test "$libsecret" != "no"; then
+if test "$libsecret" != "no" -o "$pinentry-qt" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- if test x"${PKG_CONFIG}" = xno ; then
- libsecret=no
- fi
+ if test x"${PKG_CONFIG}" = xno ; then
+ if test "$pinentry_qt" = "yes"; then
+ AC_MSG_ERROR([[
+ ***
+ *** pkg-config is required to find the Qt libraries for pinentry-qt
+ ***]])
+ else
+ pinentry_qt=no
+ fi
+ libsecret=no
+ fi
fi
dnl check if the module libsecret exists
@@ -535,68 +543,49 @@ if test "$libsecret" = "yes"; then
fi
dnl
-dnl Check for Qt4 pinentry program.
+dnl Check for Qt pinentry program.
dnl
-AC_ARG_ENABLE(pinentry-qt4,
- AC_HELP_STRING([--enable-pinentry-qt4], [build Qt4 pinentry]),
- pinentry_qt4=$enableval, pinentry_qt4=maybe)
+AC_ARG_ENABLE(pinentry-qt,
+ AC_HELP_STRING([--enable-pinentry-qt], [build qt pinentry]),
+ pinentry_qt=$enableval, pinentry_qt=maybe)
dnl
-dnl Checks for Qt4 libraries. Deal correctly with $pinentry_qt4 = maybe.
+dnl Checks for qt libraries. Deal correctly with $pinentry_qt = maybe.
+dnl Tries to find Qt5, falls back on Qt4
dnl
-if test "$pinentry_qt4" != "no"; then
-PKG_CHECK_MODULES(QT4_CORE, QtCore,,
-if test "$pinentry_qt4" = "yes"; then
- AC_MSG_ERROR([[
-***
-*** Qt4 Core is required.
-***]])
-else
- pinentry_qt4=no
-fi)
-fi
-
-if test "$pinentry_qt4" != "no"; then
-
-QT_PATH_MOC
-if test "$have_moc" != "yes"; then
- if test "$pinentry_qt4" = "yes"; then
+if test "$pinentry_qt" != "no"; then
+ FIND_QT
+ if test "$have_qt4_libs" != "yes" -a "$have_qt5_libs" != "yes"; then
+ if test "$pinentry_qt" = "yes"; then
AC_MSG_ERROR([[
***
- *** Qt moc is required.
+ *** Qt4 (QtCore, QtGui) or Qt5 (Qt5Core, Qt5Gui, Qt5Widgets) is required.
***]])
else
- pinentry_qt4=no
+ pinentry_qt=no
fi
+ fi
fi
-PKG_CHECK_MODULES(QT4_GUI, QtGui,,
-if test "$pinentry_qt4" = "yes"; then
- AC_MSG_ERROR([[
-***
-*** Qt4 Gui is required.
-***]])
-else
- pinentry_qt4=no
-fi)
-fi
+AC_SUBST(PINENTRY_QT_CFLAGS)
+AC_SUBST(PINENTRY_QT_LIBS)
+AC_SUBST(MOC)
-dnl If we have come so far, Qt4 pinentry can be build.
-if test "$pinentry_qt4" != "no"; then
- pinentry_qt4=yes
+dnl If we have come so far, qt pinentry can be build.
+if test "$pinentry_qt" != "no"; then
+ pinentry_qt=yes
fi
-AM_CONDITIONAL(BUILD_PINENTRY_QT4, test "$pinentry_qt4" = "yes")
-if test "$pinentry_qt4" = "yes"; then
- AC_DEFINE(PINENTRY_QT4, 1, [The Qt4 version of Pinentry is to be build])
+AM_CONDITIONAL(BUILD_PINENTRY_QT, test "$pinentry_qt" = "yes")
+if test "$pinentry_qt" = "yes"; then
+ AC_DEFINE(PINENTRY_QT, 1, [The qt version of Pinentry is to be build])
+ if test "$have_qt4_libs" = "yes"; then
+ pinentry_qt_lib_version="(Qt4)"
+ else
+ pinentry_qt_lib_version="(Qt5)"
+ fi
fi
-dnl if test "$pinentry_qt4" = "yes"; then
-dnl Additional checks for Qt4 pinentry.
-dnl End of additional checks for Qt4 pinentry.
-dnl fi
-
-
#
# Check whether we should build the W32 pinentry. This is actually
# the simplest check as we do this only for that platform.
@@ -613,8 +602,8 @@ AM_CONDITIONAL(BUILD_PINENTRY_W32, test "$pinentry_w32" = "yes")
if test "$pinentry_gtk_2" = "yes"; then
PINENTRY_DEFAULT=pinentry-gtk-2
else
- if test "$pinentry_qt4" = "yes"; then
- PINENTRY_DEFAULT=pinentry-qt4
+ if test "$pinentry_qt" = "yes"; then
+ PINENTRY_DEFAULT=pinentry-qt
else
if test "$pinentry_gnome_3" = "yes"; then
PINENTRY_DEFAULT=pinentry-gnome3
@@ -705,7 +694,7 @@ tty/Makefile
emacs/Makefile
gtk+-2/Makefile
gnome3/Makefile
-qt4/Makefile
+qt/Makefile
w32/Makefile
doc/Makefile
Makefile
@@ -725,7 +714,7 @@ AC_MSG_NOTICE([
Emacs Pinentry ...: $pinentry_emacs
GTK+-2 Pinentry ..: $pinentry_gtk_2
GNOME 3 Pinentry .: $pinentry_gnome_3
- Qt4 Pinentry .....: $pinentry_qt4
+ Qt Pinentry ......: $pinentry_qt $pinentry_qt_lib_version
W32 Pinentry .....: $pinentry_w32
Fallback to Curses: $fallback_curses
diff --git a/m4/qt.m4 b/m4/qt.m4
index a6b849b..0a7ea99 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -1,706 +1,93 @@
-## -*- autoconf -*-
-
-
-dnl This file is part of the KDE libraries/packages
-dnl Copyright (C) 1997 Janos Farkas (chexum at shadow.banki.hu)
-dnl (C) 1997,98,99 Stephan Kulow (coolo at kde.org)
-dnl (C) 2002 g10 Code GmbH
-dnl Modified for PINENTRY by Marcus Brinkmann.
+dnl qt.m4
+dnl Copyright (C) 2015 Intevation GmbH
dnl
-dnl This file is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2 of the License, or (at your option) any later version.
-
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Library General Public License for more details.
-
-dnl You should have received a copy of the GNU Library General Public License
-dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl Boston, MA 02111-1307, USA.
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
+dnl This file is part of PINENTRY.
dnl
-AC_DEFUN([QT_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- echo "configure: __oline__: $i/$j" >&AS_MESSAGE_LOG_FD
- if test -r "$i/$j"; then
- echo "taking that" >&AS_MESSAGE_LOG_FD
- $3=$i
- break 2
- fi
- done
-done
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler in the PATH,
-dnl in $QTDIR/bin, and some more usual places
-dnl ------------------------------------------------------------------------
+dnl PINENTRY is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
dnl
-AC_DEFUN([QT_PATH_MOC],
-[
- qt_bindirs=""
- for dir in $qt_dirs; do
- qt_bindirs="$qt_bindirs:$dir/bin:$dir/src/moc"
- done
- qt_bindirs="$qt_bindirs:/usr/bin:/usr/X11R6/bin:/usr/local/qt/bin"
- if test ! "$ac_qt_bindir" = "NO"; then
- qt_bindirs="$ac_qt_bindir:$qt_bindirs"
- fi
-
- AC_PATH_PROGS(MOC, [moc-qt4 moc], no, [$qt_bindirs])
- if test "$MOC" = no; then
- #AC_MSG_ERROR([No Qt meta object compiler (moc) found!
- #Please check whether you installed Qt correctly.
- #You need to have a running moc binary.
- #configure tried to run $ac_cv_path_moc and the test didn't
- #succeed. If configure shouldn't have tried this one, set
- #the environment variable MOC to the right one before running
- #configure.
- #])
- have_moc="no"
- else
- have_moc="yes"
- AC_SUBST(MOC)
- fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for the X Window System.
-dnl Extended the macro AC_PATH_XTRA.
-dnl ------------------------------------------------------------------------
+dnl PINENTRY is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
dnl
-AC_DEFUN([QT_PATH_X],
-[
-AC_ARG_ENABLE(
- embedded,
- [ --enable-embedded link to Qt-embedded, don't use X],
- qt_use_emb=$enableval,
- qt_use_emb=no
-)
-
-AC_ARG_ENABLE(
- palmtop,
- [ --enable-palmtop link to Qt-embedded, don't use X, link to the Qt Palmtop Environment],
- qt_use_emb_palm=$enableval,
- qt_use_emb_palm=no
-)
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-if test "$qt_use_emb" = "no"; then
- AC_PATH_X
- AC_PATH_XTRA
- if test "$no_x" = yes; then
- AC_MSG_ERROR([Can't find X. Please check your installation and add the correct paths!])
- fi
- QT_CXXFLAGS="$X_CFLAGS"
- QT_LDFLAGS="$X_LIBS"
- QT_LIBS="$X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
- QTE_NORTTI=""
-else
- dnl We're using QT Embedded
- QT_CXXFLAGS="-fno-rtti -DQWS"
- QT_LDFLAGS="-DQWS"
- QT_LIBS=""
- QTE_NORTTI="-fno-rtti -DQWS"
-fi
-AC_SUBST(QT_CXXFLAGS)
-AC_SUBST(QT_LDFLAGS)
-AC_SUBST(QT_LIBS)
-AC_SUBST(QTE_NORTTI)
-])
-
-AC_DEFUN([QT_PRINT_PROGRAM],
-[
-AC_REQUIRE([QT_CHECK_VERSION])
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$qt_ver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $qt_subver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#include <qiconview.h>
-EOF
-fi
-fi
-
-if test "$qt_ver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$qt_ver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
- QStringList *t = new QStringList();
- Q_UNUSED(t);
-EOF
-if test $qt_subver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
- QIconView iv(0);
- iv.setWordWrapIconText(false);
- QString s;
- s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$qt_ver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
- (void)QStyleFactory::create(QString::null);
- QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
- return 0;
-}
-EOF
-])
-
-
-AC_DEFUN([QT_CHECK_VERSION],
-[
-if test -z "$1"; then
- qt_ver=3
- qt_subver=1
-else
- qt_subver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
- # following is the check if subversion isn´t found in passed argument
- if test "$qt_subver" = "$1"; then
- qt_subver=1
- fi
- qt_ver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
- if test "$qt_ver" = "1"; then
- qt_subver=42
- fi
-fi
-
-if test -z "$2"; then
- if test "$qt_ver" = "2"; then
- if test $qt_subver -gt 0; then
- qt_minversion=">= Qt 2.2.2"
- else
- qt_minversion=">= Qt 2.0.2"
- fi
- fi
- if test "$qt_ver" = "3"; then
- qt_minversion=">= Qt 3.0.1"
- fi
- if test "$qt_ver" = "1"; then
- qt_minversion=">= 1.42 and < 2.0"
- fi
-else
- qt_minversion=$2
-fi
-
-if test -z "$3"; then
- if test $qt_ver = 3; then
- qt_verstring="QT_VERSION >= 301"
- fi
- if test $qt_ver = 2; then
- if test $qt_subver -gt 0; then
- qt_verstring="QT_VERSION >= 222"
- else
- qt_verstring="QT_VERSION >= 200"
- fi
- fi
- if test $qt_ver = 1; then
- qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
- fi
-else
- qt_verstring=$3
-fi
-
-if test $qt_ver = 3; then
- qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt"
-fi
-if test $qt_ver = 2; then
- qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $qt_ver = 1; then
- qt_dirs="$QTDIR /usr/lib/qt"
-fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-dnl ------------------------------------------------------------------------
+dnl Autoconf macro to find either Qt4 or Qt5
dnl
-AC_DEFUN([QT_PATH_1_3],
-[
-AC_REQUIRE([QT_PATH_X])
-AC_REQUIRE([QT_CHECK_VERSION])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
- mt,
- [ --disable-mt link to non-threaded Qt (deprecated)],
- qt_use_mt=$enableval,
- [
- if test $qt_ver = 3; then
- qt_use_mt=yes
- else
- qt_use_mt=no
- fi
- ]
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-QT_MT_LDFLAGS=
-QT_MT_LIBS=
-if test "x$qt_use_mt" = "xyes"; then
- QT_CHECK_THREADING
- if test "x$qt_use_threading" = "xyes"; then
- QT_CXXFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $QT_CXXFLAGS"
- QT_MT_LDFLAGS="$USE_THREADS"
- QT_MT_LIBS="$LIBPTHREAD"
- else
- qt_use_mt=no
- fi
-fi
-AC_SUBST(QT_MT_LDFLAGS)
-AC_SUBST(QT_MT_LIBS)
-
-dnl ------------------------------------------------------------------------
-dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-dnl ------------------------------------------------------------------------
-if test -z "$LIBQT_GLOB"; then
- if test "x$qt_use_emb" = "xyes"; then
- LIBQT_GLOB="libqte.*"
- else
- LIBQT_GLOB="libqt.*"
- fi
-fi
-
-if test -z "$LIBQT"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl ------------------------------------------------------------
- if test "x$qt_use_emb" = "xyes"; then
- qtlib="qte"
- else
- qtlib="qt"
- fi
-fi
-
-if test -z "$LIBQPE"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-palmtop then add -lqpe to the link line
-dnl ------------------------------------------------------------
- if test "x$qt_use_emb" = "xyes"; then
- if test "x$qt_use_emb_palm" = "xyes"; then
- LIB_QPE="-lqpe"
- else
- LIB_QPE=""
- fi
- else
- LIB_QPE=""
- fi
-fi
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$qt_use_mt" = "xyes"; then
- if test -z "$LIBQT"; then
- LIBQT="-l$qtlib-mt"
- else
- LIBQT="$qtlib-mt"
- fi
- LIBQT_GLOB="lib$qtlib-mt.*"
- USING_QT_MT="using -mt"
-else
- LIBQT="-l$qtlib"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-QT_LIBS="$LIBQT $QT_LIBS"
-test -z "$QT_MT_LIBS" || QT_LIBS="$QT_LIBS $QT_MT_LIBS"
-
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
- [ --with-qt-dir=DIR where the root of Qt is installed ],
- [ ac_qt_includes="$withval"/include
- ac_qt_libraries="$withval"/lib
- ac_qt_bindir="$withval"/bin
- ])
-
-AC_ARG_WITH(qt-includes,
- [ --with-qt-includes=DIR where the Qt includes are. ],
- [
- ac_qt_includes="$withval"
- ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
- [ --with-qt-libraries=DIR where the Qt library is installed.],
- [ ac_qt_libraries="$withval"
- kde_qt_libs_given=yes
- ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
-
-qt_incdirs=""
-for dir in $qt_dirs; do
- qt_incdirs="$qt_incdirs $dir/include $dir"
-done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
- qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$qt_ver" != "1"; then
- kde_qt_header=qstyle.h
-else
- kde_qt_header=qglobal.h
-fi
-
-QT_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-ac_qt_includes="$qt_incdir"
-
-qt_libdirs=""
-for dir in $qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib $dir"
-done
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
- qt_libdir=$ac_qt_libraries
-else
- qt_libdirs="$ac_qt_libraries $qt_libdirs"
- # if the Qt was given, the chance is too big that libqt.* doesn't exist
- qt_libdir=NONE
- for dir in $qt_libdirs; do
- try="ls -1 $dir/${LIBQT_GLOB}"
- if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AS_MESSAGE_LOG_FD; fi
- done
-fi
-
-ac_qt_libraries="$qt_libdir"
-
-AC_LANG_PUSH(C++)
-
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $QT_CXXFLAGS"
-LDFLAGS="$LDFLAGS -L$qt_libdir $QT_LDFLAGS"
-LIBS="$LIBS $QT_LIBS"
-
-QT_PRINT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- rm -f conftest*
-else
- echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
- ac_qt_libraries="NO"
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-AC_LANG_POP(C++)
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
- ac_cv_have_qt="have_qt=no"
- ac_qt_notfound=""
- missing_qt_mt=""
- if test "$ac_qt_includes" = NO; then
- if test "$ac_qt_libraries" = NO; then
- ac_qt_notfound="(headers and libraries)";
- else
- ac_qt_notfound="(headers)";
- fi
- else
- if test "x$qt_use_mt" = "xyes"; then
- missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
- ac_qt_notfound="(library $qtlib-mt)";
- else
- ac_qt_notfound="(library $qtlib)";
- fi
- fi
-
- #AC_MSG_ERROR([Qt ($qt_minversion) $ac_qt_notfound not found. Please check your installation!
- #For more details about this problem, look at the end of config.log.$missing_qt_mt])
- have_qt="no"
-else
- have_qt="yes"
-fi
-])
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
- AC_MSG_RESULT([$have_qt]);
-else
- ac_cv_have_qt="have_qt=yes \
- ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
- AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
-
- qt_libraries="$ac_qt_libraries"
- qt_includes="$ac_qt_includes"
-fi
-
-AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
-
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
-else
- QT_INCLUDES="-I$qt_includes"
-fi
-
-if test "$qt_libraries" != "$x_libraries" && test -n "$qt_libraries"; then
- QT_LDFLAGS="$QT_LDFLAGS -L$qt_libraries"
-fi
-test -z "$QT_MT_LDFLAGS" || QT_LDFLAGS="$QT_LDFLAGS $QT_MT_LDFLAGS"
-
-AC_SUBST(QT_INCLUDES)
-QT_PATH_MOC
-
-
-AC_SUBST(LIB_QPE)
-])
-
-AC_DEFUN([QT_PATH],
-[
-QT_PATH_1_3
-QT_CHECK_RPATH
-])
-
-
-AC_DEFUN([QT_CHECK_COMPILER_FLAG],
-[
-AC_MSG_CHECKING(whether $CXX supports -$1)
-kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
- AC_LANG_PUSH(C++)
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -$1"
- AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
- CXXFLAGS="$save_CXXFLAGS"
- AC_LANG_POP(C++)
-])
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-dnl QT_REMOVE_FORBIDDEN removes forbidden arguments from variables
-dnl use: QT_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-dnl it's all white-space separated
-AC_DEFUN([QT_REMOVE_FORBIDDEN],
-[ __val=$$1
- __forbid=" $2 "
- if test -n "$__val"; then
- __new=""
- ac_save_IFS=$IFS
- IFS=" "
- for i in $__val; do
- case "$__forbid" in
- *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
- *) # Careful to not add spaces, where there were none, because otherwise
- # libtool gets confused, if we change e.g. CXX
- if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
- esac
- done
- IFS=$ac_save_IFS
- $1=$__new
- fi
-])
-
-dnl QT_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN([QT_VALIDIFY_CXXFLAGS],
-[dnl
-if test "x$qt_use_emb" != "xyes"; then
- QT_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- QT_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-else
- QT_REMOVE_FORBIDDEN(CXX, [-rpath])
- QT_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-fi
-])
+dnl sets PINENTRY_QT_LIBS and PINENTRY_QT_CFLAGS
+dnl
+dnl if QT5 was found have_qt5_libs is set to yes
+dnl if QT4 was found have_qt4_libs is set to yes
+dnl
+dnl The moc lookup code is based on libpoppler (rev. d821207)
-AC_DEFUN([QT_CHECK_COMPILERS],
+AC_DEFUN([FIND_QT],
[
- AC_PROG_CXX
-
- QT_CHECK_COMPILER_FLAG(fexceptions,[QT_CXXFLAGS="$QT_CXXFLAGS -fexceptions"])
-
- case "$host" in
- *-*-irix*) test "$GXX" = yes && QT_CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $QT_CXXFLAGS" ;;
- *-*-sysv4.2uw*) QT_CXXFLAGS="-D_UNIXWARE $QT_CXXFLAGS";;
- *-*-sysv5uw7*) QT_CXXFLAGS="-D_UNIXWARE7 $QT_CXXFLAGS";;
- *-*-solaris*)
- if test "$GXX" = yes; then
- libstdcpp=`$CXX -print-file-name=libstdc++.so`
- if test ! -f $libstdcpp; then
- AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with the Qt pinentry. Please recompile gcc with --enable-shared to receive a libstdc++.so])
- fi
+ PKG_CHECK_MODULES(PINENTRY_QT,
+ Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
+ [have_qt5_libs="yes"],
+ [have_qt5_libs="no"])
+
+ if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+ PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic"
+ fi
+
+ if test "$have_qt5_libs" = "yes"; then
+ AC_CHECK_TOOL(MOC, moc)
+ AC_MSG_CHECKING([moc version])
+ mocversion=`$MOC -v 2>&1`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ AC_MSG_RESULT([no])
+ # moc was not the qt5 one, try with moc-qt5
+ AC_CHECK_TOOL(MOC2, moc-qt5)
+ mocversion=`$MOC2 -v 2>&1`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ AC_CHECK_TOOL(QTCHOOSER, qtchooser)
+ qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+ mocversion=`$qt5tooldir/moc -v 2>&1`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ # no valid moc found
+ have_qt5_libs="no";
+ else
+ MOC=$qt5tooldir/moc
fi
- ;;
- esac
-
- QT_VALIDIFY_CXXFLAGS
-
- AC_PROG_CXXCPP
-])
-
-AC_DEFUN([QT_CHECK_RPATH],
-[
-AC_MSG_CHECKING(for rpath)
-AC_ARG_ENABLE(rpath,
- [ --disable-rpath do not use the rpath feature of ld],
- USE_RPATH=$enableval, USE_RPATH=yes)
-
-if test -z "$QT_RPATH" && test "$USE_RPATH" = "yes"; then
-
- QT_RPATH=""
- if test -n "$qt_libraries"; then
- QT_RPATH="$QT_RPATH -Wl,--rpath -Wl,\$(qt_libraries)"
- fi
- dnl $x_libraries is set to /usr/lib in case
- if test -n "$X_LIBS"; then
- QT_RPATH="$QT_RPATH -Wl,--rpath -Wl,\$(x_libraries)"
- fi
-fi
-AC_SUBST(x_libraries)
-AC_SUBST(QT_RPATH)
-AC_MSG_RESULT($USE_RPATH)
-])
-
-
-AC_DEFUN([QT_CHECK_LIBPTHREAD],
-[
-AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([QT_CHECK_PTHREAD_OPTION],
-[
- AC_ARG_ENABLE(kernel-threads, [ --enable-kernel-threads Enable the use of the LinuxThreads port on FreeBSD/i386 only.],
- kde_use_kernthreads=$enableval, kde_use_kernthreads=no)
-
- if test "$kde_use_kernthreads" = "yes"; then
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_CFLAGS="$CXXFLAGS"
- CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS"
- CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS"
- AC_CHECK_HEADERS(pthread/linuxthreads/pthread.h)
- CXXFLAGS="$ac_save_CXXFLAGS"
- CFLAGS="$ac_save_CFLAGS"
- if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then
- kde_use_kernthreads=no
else
- dnl Add proper -I and -l statements
- AC_CHECK_LIB(lthread, pthread_join, [LIBPTHREAD="-llthread -llgcc_r"]) dnl for FreeBSD
- if test "x$LIBPTHREAD" = "x"; then
- kde_use_kernthreads=no
+ MOC=$MOC2
+ fi
+ fi
+ fi
+ if test "$have_qt5_libs" != "yes"; then
+ PKG_CHECK_MODULES(PINENTRY_QT,
+ QtCore >= 4.4.0 QtGui >= 4.4.0,
+ [have_qt4_libs="yes"],
+ [have_qt4_libs="no"])
+ if test "$have_qt4_libs" = "yes"; then
+ AC_CHECK_TOOL(MOC, moc)
+ AC_MSG_CHECKING([moc version])
+ mocversion=`$MOC -v 2>&1`
+ mocversiongrep=`echo $mocversion | grep "Qt 4"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ AC_MSG_RESULT([no])
+ # moc was not the qt4 one, try with moc-qt4
+ AC_CHECK_TOOL(MOC2, moc-qt4)
+ mocversion=`$MOC2 -v 2>&1`
+ mocversiongrep=`echo $mocversion | grep "Qt 4"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
+ # no valid moc found
+ have_qt4_libs="no";
+ MOC="not found"
else
- USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads"
+ MOC=$MOC2
fi
fi
- else
- USE_THREADS=""
- if test -z "$LIBPTHREAD"; then
- QT_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-pthread"] )
- fi
- fi
-
- case $host_os in
- solaris*)
- QT_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
- QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
- ;;
- freebsd*)
- QT_CXXFLAGS="$QT_CXXFLAGS -D_THREAD_SAFE"
- ;;
- aix*)
- QT_CXXFLAGS="$QT_CXXFLAGS -D_THREAD_SAFE"
- LIBPTHREAD="$LIBPTHREAD -lc_r"
- ;;
- linux*) QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT"
- if test "$CXX" = "KCC"; then
- QT_CXXFLAGS="$QT_CXXFLAGS --thread_safe"
- fi
- ;;
- *)
- ;;
- esac
- AC_SUBST(USE_THREADS)
- AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([QT_CHECK_THREADING],
-[
- AC_REQUIRE([QT_CHECK_LIBPTHREAD])
- AC_REQUIRE([QT_CHECK_PTHREAD_OPTION])
- dnl default is yes if libpthread is found and no if no libpthread is available
- if test -z "$LIBPTHREAD"; then
- if test -z "$USE_THREADS"; then
- kde_check_threading_default=no
- else
- kde_check_threading_default=yes
fi
- else
- kde_check_threading_default=yes
- fi
- AC_ARG_ENABLE(threading, [ --disable-threading disables threading even if libpthread found ],
- qt_use_threading=$enableval, qt_use_threading=$kde_check_threading_default)
- if test "x$qt_use_threading" = "xyes"; then
- AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
fi
])
diff --git a/qt4/Makefile.am b/qt/Makefile.am
similarity index 85%
rename from qt4/Makefile.am
rename to qt/Makefile.am
index 8462d4f..96d0880 100644
--- a/qt4/Makefile.am
+++ b/qt/Makefile.am
@@ -20,7 +20,7 @@
## Process this file with automake to produce Makefile.in
-bin_PROGRAMS = pinentry-qt4
+bin_PROGRAMS = pinentry-qt
EXTRA_DIST = document-encrypt.png pinentry.qrc
@@ -37,10 +37,10 @@ endif
AM_CPPFLAGS = $(COMMON_CFLAGS) \
-I$(top_srcdir) -I$(top_srcdir)/secmem \
$(ncurses_include) -I$(top_srcdir)/pinentry
-AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS)
-pinentry_qt4_LDADD = \
+AM_CXXFLAGS = $(PINENTRY_QT_CFLAGS)
+pinentry_qt_LDADD = \
../pinentry/libpinentry.a $(top_builddir)/secmem/libsecmem.a \
- $(COMMON_LIBS) $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) $(LIBCAP)
+ $(COMMON_LIBS) $(PINENTRY_QT_LIBS) $(libcurses) $(LIBCAP)
BUILT_SOURCES = \
pinentryconfirm.moc pinentrydialog.moc
@@ -48,10 +48,10 @@ BUILT_SOURCES = \
CLEANFILES = \
pinentryconfirm.moc pinentrydialog.moc
-pinentry_qt4_SOURCES = pinentrydialog.h pinentrydialog.cpp \
+pinentry_qt_SOURCES = pinentrydialog.h pinentrydialog.cpp \
main.cpp qrc_pinentry.cpp pinentryconfirm.cpp pinentryconfirm.h
-nodist_pinentry_qt4_SOURCES = \
+nodist_pinentry_qt_SOURCES = \
pinentryconfirm.moc pinentrydialog.moc
.h.moc:
diff --git a/qt4/document-encrypt.png b/qt/document-encrypt.png
similarity index 100%
rename from qt4/document-encrypt.png
rename to qt/document-encrypt.png
diff --git a/qt4/main.cpp b/qt/main.cpp
similarity index 97%
rename from qt4/main.cpp
rename to qt/main.cpp
index 5bc6193..0500b7a 100644
--- a/qt4/main.cpp
+++ b/qt/main.cpp
@@ -1,5 +1,5 @@
/*
- main.cpp - A (not yet) secure Qt 4 dialog for PIN entry.
+ main.cpp - A Qt dialog for PIN entry.
Copyright (C) 2002, 2008 Klarälvdalens Datakonsult AB (KDAB)
Copyright (C) 2003 g10 Code GmbH
@@ -148,7 +148,7 @@ qt_cmd_handler (pinentry_t pe)
/* else */ QLatin1String( "&Cancel" ) ;
const QString title =
pe->title ? from_utf8( pe->title ) :
- /* else */ QLatin1String( "pinentry-qt4" ) ;
+ /* else */ QLatin1String( "pinentry-qt" ) ;
if (want_pass)
@@ -258,7 +258,7 @@ pinentry_cmd_handler_t pinentry_cmd_handler = qt_cmd_handler_ex;
int
main (int argc, char *argv[])
{
- pinentry_init ("pinentry-qt4");
+ pinentry_init ("pinentry-qt");
std::auto_ptr<QApplication> app;
@@ -283,7 +283,7 @@ main (int argc, char *argv[])
*new_argv = (char*)malloc (n);
if (!new_argv || !*new_argv)
{
- fprintf (stderr, "pinentry-qt4: can't fixup argument list: %s\n",
+ fprintf (stderr, "pinentry-qt: can't fixup argument list: %s\n",
strerror (errno));
exit (EXIT_FAILURE);
diff --git a/qt4/pinentry.qrc b/qt/pinentry.qrc
similarity index 100%
rename from qt4/pinentry.qrc
rename to qt/pinentry.qrc
diff --git a/qt4/pinentryconfirm.cpp b/qt/pinentryconfirm.cpp
similarity index 100%
rename from qt4/pinentryconfirm.cpp
rename to qt/pinentryconfirm.cpp
diff --git a/qt4/pinentryconfirm.h b/qt/pinentryconfirm.h
similarity index 100%
rename from qt4/pinentryconfirm.h
rename to qt/pinentryconfirm.h
diff --git a/qt4/pinentrydialog.cpp b/qt/pinentrydialog.cpp
similarity index 99%
rename from qt4/pinentrydialog.cpp
rename to qt/pinentrydialog.cpp
index bfbb71d..c7885d3 100644
--- a/qt4/pinentrydialog.cpp
+++ b/qt/pinentrydialog.cpp
@@ -92,7 +92,7 @@ void raiseWindow( QWidget* w )
QPixmap icon( QStyle::StandardPixmap which )
{
QPixmap pm = qApp->windowIcon().pixmap( 48, 48 );
-
+
if ( which != QStyle::SP_CustomBase ) {
const QIcon ic = qApp->style()->standardIcon( which );
QPainter painter( &pm );
diff --git a/qt4/pinentrydialog.h b/qt/pinentrydialog.h
similarity index 100%
rename from qt4/pinentrydialog.h
rename to qt/pinentrydialog.h
diff --git a/qt4/qrc_pinentry.cpp b/qt/qrc_pinentry.cpp
similarity index 99%
rename from qt4/qrc_pinentry.cpp
rename to qt/qrc_pinentry.cpp
index d15f01b..6ab2129 100644
--- a/qt4/qrc_pinentry.cpp
+++ b/qt/qrc_pinentry.cpp
@@ -128,7 +128,6 @@ static const unsigned char qt_resource_data[] = {
0x31,0xb0,0x89,0xe2,0xa,0xa9,0xb3,0xb4,0x87,0x7f,0xe,0xeb,0x3d,0x50,0xef,0x1d,
0xc2,0xfd,0x4b,0xe1,0x7f,0x0,0xd8,0x6e,0xc6,0xdd,0x5d,0xd6,0xb,0x18,0x0,0x0,
0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-
};
static const unsigned char qt_resource_name[] = {
@@ -138,7 +137,6 @@ static const unsigned char qt_resource_name[] = {
0x0,0x64,
0x0,0x6f,0x0,0x63,0x0,0x75,0x0,0x6d,0x0,0x65,0x0,0x6e,0x0,0x74,0x0,0x2d,0x0,0x65,0x0,0x6e,0x0,0x63,0x0,0x72,0x0,0x79,0x0,0x70,0x0,0x74,0x0,0x2e,
0x0,0x70,0x0,0x6e,0x0,0x67,
-
};
static const unsigned char qt_resource_struct[] = {
@@ -177,4 +175,3 @@ int QT_MANGLE_NAMESPACE(qCleanupResources_pinentry)()
}
Q_DESTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qCleanupResources_pinentry))
-
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 10 +-
Makefile.am | 10 +-
README | 6 +-
autogen.rc | 2 +-
configure.ac | 97 +++--
m4/qt.m4 | 767 ++++-----------------------------------
{qt4 => qt}/Makefile.am | 12 +-
{qt4 => qt}/document-encrypt.png | Bin
{qt4 => qt}/main.cpp | 8 +-
{qt4 => qt}/pinentry.qrc | 0
{qt4 => qt}/pinentryconfirm.cpp | 0
{qt4 => qt}/pinentryconfirm.h | 0
{qt4 => qt}/pinentrydialog.cpp | 2 +-
{qt4 => qt}/pinentrydialog.h | 0
{qt4 => qt}/qrc_pinentry.cpp | 3 -
15 files changed, 145 insertions(+), 772 deletions(-)
rename {qt4 => qt}/Makefile.am (85%)
rename {qt4 => qt}/document-encrypt.png (100%)
rename {qt4 => qt}/main.cpp (97%)
rename {qt4 => qt}/pinentry.qrc (100%)
rename {qt4 => qt}/pinentryconfirm.cpp (100%)
rename {qt4 => qt}/pinentryconfirm.h (100%)
rename {qt4 => qt}/pinentrydialog.cpp (99%)
rename {qt4 => qt}/pinentrydialog.h (100%)
rename {qt4 => qt}/qrc_pinentry.cpp (99%)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list