whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,983 Commits
1 Branch
0 Tags
407 MiB
Commit Graph

6 Commits (60f36007a361f4102a9cc0ceb65040ebc19d2653)

Author SHA1 Message Date
Volker Hilsheimer 3fa778142a Silence qdoc warning from deprecated enum value 
The mis-spelled value doesn't need documentation.

Pick-to: 6.1
Change-Id: I709abdca1d515902b3a12d3c5a5b62809d1f9a8b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2021-04-12 15:19:41 +00:00
Laszlo Agocs 2cfbce4bc6 QOpenGLTexture: Fix typo in enum value 
Pick-to: 6.1
Fixes: QTBUG-91431
Change-Id: I59c37de527f53339130216997402f325d0badb12
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
 2021-03-03 14:50:59 +01:00
Volker Hilsheimer 43735342b5 QOpenGLTexture: Remove obsolete data upload overloads 
Address ### Qt 6 comment

Change-Id: I2952175ec72c5c4c7b4e518754fb1bc6f88b21df
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
 2020-09-10 17:30:09 +02:00
Eskil Abrahamsen Blomfeldt ad5aee2e34 Get rid of QT_OPENGL_ES* 
The QT_OPENGL_ES* macros are leftovers from an earlier,
ad hoc configuration system, which has since been
replaced by QT_CONFIG. To clean things up in Qt 6,
we use the new way instead.

Task-number: QTBUG-83467
Change-Id: I578dc7695bff9d5ee303b22e44f60fee22fe0c28
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2020-04-17 11:50:24 +02:00
Liang Qi 6b2535ea15 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
 2020-02-13 18:31:40 +01:00
Johan Klokkhammer Helsing 2344e5cc31 Move QOpenGLTexture and related classes from QtGui to QtOpenGL 
Task-number: QTBUG-74409
Change-Id: Ied825dd7cb92365505a4aa43fd67488024160341
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-01-24 08:57:38 +01:00