Use URL with transport encryption
This commit is contained in:
parent
f62086f9d3
commit
84244a7cf6
5 changed files with 6 additions and 6 deletions
|
@ -186,7 +186,7 @@ set_package_properties(Libinput PROPERTIES TYPE REQUIRED PURPOSE "Required for i
|
||||||
|
|
||||||
find_package(UDev)
|
find_package(UDev)
|
||||||
set_package_properties(UDev PROPERTIES
|
set_package_properties(UDev PROPERTIES
|
||||||
URL "http://www.freedesktop.org/software/systemd/libudev/"
|
URL "https://www.freedesktop.org/wiki/Software/systemd/"
|
||||||
DESCRIPTION "Linux device library."
|
DESCRIPTION "Linux device library."
|
||||||
TYPE REQUIRED
|
TYPE REQUIRED
|
||||||
PURPOSE "Required for input handling on Wayland."
|
PURPOSE "Required for input handling on Wayland."
|
||||||
|
|
|
@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http:// www.gnu.org/licenses/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*********************************************************************/
|
*********************************************************************/
|
||||||
|
|
||||||
#include "scripting/scriptedeffect.h"
|
#include "scripting/scriptedeffect.h"
|
||||||
|
|
|
@ -655,7 +655,7 @@ void ScreenShotEffect::convertFromGLImage(QImage &img, int w, int h)
|
||||||
{
|
{
|
||||||
// from QtOpenGL/qgl.cpp
|
// from QtOpenGL/qgl.cpp
|
||||||
// Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
|
// Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
|
||||||
// see http://qt.gitorious.org/qt/qt/blobs/master/src/opengl/qgl.cpp
|
// see https://github.com/qt/qtbase/blob/dev/src/opengl/qgl.cpp
|
||||||
if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
|
if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
|
||||||
// OpenGL gives RGBA; Qt wants ARGB
|
// OpenGL gives RGBA; Qt wants ARGB
|
||||||
uint *p = (uint*)img.bits();
|
uint *p = (uint*)img.bits();
|
||||||
|
|
|
@ -673,9 +673,9 @@ void Options::setWindowsBlockCompositing(bool value)
|
||||||
void Options::setGlPreferBufferSwap(char glPreferBufferSwap)
|
void Options::setGlPreferBufferSwap(char glPreferBufferSwap)
|
||||||
{
|
{
|
||||||
if (glPreferBufferSwap == 'a') {
|
if (glPreferBufferSwap == 'a') {
|
||||||
// buffer cpying is very fast with the nvidia blob
|
// buffer copying is very fast with the nvidia blob
|
||||||
// but due to restrictions in DRI2 *incredibly* slow for all MESA drivers
|
// but due to restrictions in DRI2 *incredibly* slow for all MESA drivers
|
||||||
// see http://www.x.org/releases/X11R7.7/doc/dri2proto/dri2proto.txt, item 2.5
|
// see https://www.x.org/releases/X11R7.7/doc/dri2proto/dri2proto.txt, item 2.5
|
||||||
if (GLPlatform::instance()->driver() == Driver_NVidia)
|
if (GLPlatform::instance()->driver() == Driver_NVidia)
|
||||||
glPreferBufferSwap = CopyFrontBuffer;
|
glPreferBufferSwap = CopyFrontBuffer;
|
||||||
else if (GLPlatform::instance()->driver() != Driver_Unknown) // undetected, finally resolved when context is initialized
|
else if (GLPlatform::instance()->driver() != Driver_Unknown) // undetected, finally resolved when context is initialized
|
||||||
|
|
|
@ -191,7 +191,7 @@ static void convertFromGLImage(QImage &img, int w, int h)
|
||||||
{
|
{
|
||||||
// from QtOpenGL/qgl.cpp
|
// from QtOpenGL/qgl.cpp
|
||||||
// Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
|
// Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
|
||||||
// see http://qt.gitorious.org/qt/qt/blobs/master/src/opengl/qgl.cpp
|
// see https://github.com/qt/qtbase/blob/dev/src/opengl/qgl.cpp
|
||||||
if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
|
if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
|
||||||
// OpenGL gives RGBA; Qt wants ARGB
|
// OpenGL gives RGBA; Qt wants ARGB
|
||||||
uint *p = (uint*)img.bits();
|
uint *p = (uint*)img.bits();
|
||||||
|
|
Loading…
Reference in a new issue