From e8479592c5654e9ccc2f555f32db70e4d0b09ba9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 24 Dec 2015 11:59:49 +0100 Subject: Doc: mention that Qt::AA_X11InitThreads isn't used anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Whether or not to call XInitThreads() doesn't apply since Qt-5.0's switch to XCB. Change-Id: I5f1e5e664a251c98af6357c87fc9a6bb03a46ce3 Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö --- src/corelib/global/qnamespace.qdoc | 4 +--- tests/auto/opengl/qglthreads/tst_qglthreads.cpp | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index be7240b4ef..7c5263ddbd 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -144,9 +144,7 @@ to be consistent in pixels-per-point across devices rather than defining 1 point as 1/72 inch. - \value AA_X11InitThreads Calls \c XInitThreads() as part of the QApplication - construction in order to make Xlib calls thread-safe. This - attribute must be set before QApplication is constructed. + \value AA_X11InitThreads This value is obsolete and has no effect. \value AA_SynthesizeTouchForUnhandledMouseEvents All mouse events that are not accepted by the application will be translated diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index ff5a18dedb..6a726ac62d 100644 --- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp @@ -796,7 +796,6 @@ void tst_QGLThreads::painterOnFboInThread() int main(int argc, char **argv) { - QApplication::setAttribute(Qt::AA_X11InitThreads); QApplication app(argc, argv); QTEST_DISABLE_KEYPAD_NAVIGATION \ -- cgit v1.2.3