Commit 99f17a25 authored by yanmorin's avatar yanmorin

Compilation on gentoo

- Key_Mode_switch isn't part of QT 3.3 (official)
- qt program are better with full path (moc, uic, qembed)
parent c8f9f838
......@@ -102,16 +102,16 @@ for another architecture.
Installation Names
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PREFIX'.
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PREFIX', the package will
use PREFIX as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
......@@ -159,7 +159,7 @@ where SYSTEM can have one of these forms:
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the `--target=TYPE' option to select the type of system they will
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
......
......@@ -140,7 +140,7 @@ dnl AM_CONDITIONAL(USE_SAMPLERATE, test x$with_samplerate = xyes)
dnl Check for GNU ccRTP
PKG_PROG_PKG_CONFIG
LIBSAMPLERATE_MIN_VERSION=0.1.2
LIBSAMPLERATE_MIN_VERSION=0.1.1
PKG_CHECK_MODULES(samplerate, samplerate >= ${LIBSAMPLERATE_MIN_VERSION})
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $samplerate_CFLAGS"
SFLPHONE_LIBS="$SFLPHONE_LIBS $samplerate_LIBS"
......
......@@ -81,13 +81,13 @@ esac
AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
dnl Check that moc is in path
AC_CHECK_PROG(MOC, moc, moc)
AC_PATH_PROG(MOC, moc, [], [$QTDIR/bin:$PATH])
if test x$MOC = x ; then
AC_MSG_ERROR([*** moc must be in path])
fi
dnl uic is the Qt user interface compiler
AC_CHECK_PROG(UIC, uic, uic)
AC_PATH_PROG(UIC, uic, [], [$QTDIR/bin:$PATH])
if test x$UIC = x ; then
AC_MSG_ERROR([*** uic must be in path])
fi
......@@ -95,7 +95,7 @@ fi
dnl qembed is the Qt data embedding utility.
dnl It is located in $QTDIR/tools/qembed, and must be compiled and installed
dnl manually, we'll let it slide if it isn't present
AC_CHECK_PROG(QEMBED, qembed, qembed)
AC_PATH_PROG(QEMBED, qembed, [], [$QTDIR/bin:$PATH])
dnl Calculate Qt include path
......
......@@ -173,8 +173,9 @@ SFLPhoneWindow::keyPressEvent(QKeyEvent *e) {
emit shortcutPressed(e);
} else if (key != Qt::Key_Shift &&
key != Qt::Key_Meta &&
key != Qt::Key_Alt &&
key != Qt::Key_Mode_switch
key != Qt::Key_Alt /* &&
key != Qt::Key_Mode_switch // this is not in gentoo (same qt version)
*/
) {
emit keyPressed(Qt::Key(key));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment