diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/cmake/pass1/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/gui/qopengl/tst_qopengl.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp | 4 |
6 files changed, 10 insertions, 12 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index b9b0e8c605..dfcb225555 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -85,8 +85,7 @@ else() message("CMake version older than 2.8.7 (Found ${CMAKE_VERSION}). Not running test \"pass1\"") endif() expect_pass(pass2) -# Modules do not currently find their own dependencies. -# expect_pass(pass3) +expect_pass(pass3) expect_fail(fail4) expect_fail(fail5) expect_pass("pass(needsquoting)6") diff --git a/tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt b/tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt index 7b9561c588..63f675df18 100644 --- a/tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt +++ b/tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt @@ -9,14 +9,14 @@ find_package(Qt5Widgets REQUIRED) include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) -add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) +add_definitions(${Qt5Core_DEFINITIONS}) set(CMAKE_INCLUDE_CURRENT_DIR ON) qt5_wrap_cpp(moc_files mywidget.h) qt5_wrap_ui(ui_files mywidget.ui) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") add_executable(mywidget mywidget.cpp ${moc_files} ${ui_files}) -target_link_libraries(mywidget ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Core_LIBRARIES}) +target_link_libraries(mywidget ${Qt5Widgets_LIBRARIES}) diff --git a/tests/auto/cmake/pass1/CMakeLists.txt b/tests/auto/cmake/pass1/CMakeLists.txt index 970ca33078..cbe3afc7c4 100644 --- a/tests/auto/cmake/pass1/CMakeLists.txt +++ b/tests/auto/cmake/pass1/CMakeLists.txt @@ -43,9 +43,6 @@ endmacro() add_executable(two two.cpp) add_executable(three three.cpp) -qt5_use_package(two Core) qt5_use_package(two Test) qt5_use_package(three Widgets) -qt5_use_package(three Gui) -qt5_use_package(three Core) qt5_use_package(three Test) diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp index 38208d27c8..324e1f5d12 100644 --- a/tests/auto/gui/qopengl/tst_qopengl.cpp +++ b/tests/auto/gui/qopengl/tst_qopengl.cpp @@ -474,6 +474,9 @@ void tst_QOpenGL::openGLPaintDevice() QOpenGLContext ctx; ctx.create(); + QSurfaceFormat format = ctx.format(); + if (format.majorVersion() < 2) + QSKIP("This test requires at least OpenGL 2.0"); ctx.makeCurrent(&window); QImage image(128, 128, QImage::Format_RGB32); diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 824f5fc507..90cecba72c 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -4410,9 +4410,8 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress() incomingSocket->setReadBufferSize(1*1024); - QTestEventLoop::instance().enterLoop(2); // some progress should have been made - QVERIFY(!spy.isEmpty()); + QTRY_VERIFY(!spy.isEmpty()); QList<QVariant> args = spy.last(); QVERIFY(args.at(0).toLongLong() > 0); // but not everything! diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp index d8b193f5c8..2b92f7c7b6 100644 --- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp +++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp @@ -138,10 +138,10 @@ public slots: { QUrl url("http://127.0.0.1:1088"); QNetworkRequest req(url); - req.setRawHeader("POST", url.path().toAscii()); + req.setRawHeader("POST", url.path().toLatin1()); req.setRawHeader("user-agent", "xml-test"); req.setRawHeader("keep-alive", "false"); - req.setRawHeader("host", url.host().toAscii()); + req.setRawHeader("host", url.host().toLatin1()); QByteArray xmlrpc("<methodCall>\r\n\ <methodName>SFD.GetVersion</methodName>\r\n\ |