enable -qt-xcb to fix non-US keys under VNC (#1295713)
This commit is contained in:
parent
73aff94c60
commit
f1a8d41bb2
@ -185,6 +185,9 @@ BuildRequires: pkgconfig(xkbcommon)
|
|||||||
%endif
|
%endif
|
||||||
%else
|
%else
|
||||||
# not Fedora
|
# not Fedora
|
||||||
|
%if 0%{?rhel} == 6
|
||||||
|
%global xcb -qt-xcb
|
||||||
|
%endif
|
||||||
%global xkbcommon -qt-xkbcommon
|
%global xkbcommon -qt-xkbcommon
|
||||||
Provides: bundled(libxkbcommon) = 0.4.1
|
Provides: bundled(libxkbcommon) = 0.4.1
|
||||||
%endif
|
%endif
|
||||||
@ -395,10 +398,13 @@ sed -i -e 's|^\(QMAKE_STRIP.*=\).*$|\1|g' mkspecs/common/linux.conf
|
|||||||
# move some bundled libs to ensure they're not accidentally used
|
# move some bundled libs to ensure they're not accidentally used
|
||||||
pushd src/3rdparty
|
pushd src/3rdparty
|
||||||
mkdir UNUSED
|
mkdir UNUSED
|
||||||
mv freetype libjpeg libpng zlib xcb UNUSED/
|
mv freetype libjpeg libpng zlib UNUSED/
|
||||||
%if "%{?sqlite}" == "-system-sqlite"
|
%if "%{?sqlite}" == "-system-sqlite"
|
||||||
mv sqlite UNUSED/
|
mv sqlite UNUSED/
|
||||||
%endif
|
%endif
|
||||||
|
%if "%{?xcb}" != "-qt-xcb"
|
||||||
|
mv xcb UNUSED/
|
||||||
|
%endif
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# builds failing mysteriously on f20
|
# builds failing mysteriously on f20
|
||||||
@ -456,6 +462,7 @@ test -x configure || chmod +x configure
|
|||||||
%{?pcre} \
|
%{?pcre} \
|
||||||
%{?sqlite} \
|
%{?sqlite} \
|
||||||
%{?tds} \
|
%{?tds} \
|
||||||
|
%{?xcb} \
|
||||||
%{?xkbcommon} \
|
%{?xkbcommon} \
|
||||||
-system-zlib \
|
-system-zlib \
|
||||||
%{?use_gold_linker} \
|
%{?use_gold_linker} \
|
||||||
@ -939,8 +946,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jan 05 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-11
|
* Fri Jan 15 2016 Than Ngo <than@redhat.com> - 5.5.1-11
|
||||||
- Crash in QXcbWindow::setParent() due to NULL xcbScreen (QTBUG-50081, #1291003)
|
- Crash in QXcbWindow::setParent() due to NULL xcbScreen (QTBUG-50081, #1291003)
|
||||||
|
- enable -qt-xcb to fix non-US keys under VNC (#1295713)
|
||||||
|
|
||||||
* Tue Jan 05 2016 Jan Grulich <jgrulich@redhat.com> - 5.5.1-10
|
* Tue Jan 05 2016 Jan Grulich <jgrulich@redhat.com> - 5.5.1-10
|
||||||
- QLineEdit - fix visibility handling of side widgets
|
- QLineEdit - fix visibility handling of side widgets
|
||||||
|
Loading…
Reference in New Issue
Block a user