diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-12 09:01:52 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-12 11:07:56 +0100 |
| commit | 6b8c0a50585bb637c5cd33ca8ffde0cb9c4e3664 (patch) | |
| tree | 12647726671357a571e2b371b0e33199efb08156 /tests/auto/opengl | |
| parent | 66d94ea30be9c4c8cc81a52134022eb662bedd77 (diff) | |
| parent | ca7f1d2197f78ec3332cfd86ab9921730b6d4f23 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I5839bded07e23af65ced9491c4f50242f964dd31
Diffstat (limited to 'tests/auto/opengl')
| -rw-r--r-- | tests/auto/opengl/qglthreads/tst_qglthreads.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp index 7b7064529f..1dafa2779c 100644 --- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp @@ -805,7 +805,6 @@ void tst_QGLThreads::painterOnFboInThread() int main(int argc, char **argv) { - QApplication::setAttribute(Qt::AA_X11InitThreads); QApplication app(argc, argv); QTEST_DISABLE_KEYPAD_NAVIGATION \ |