diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-14 19:19:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-16 21:54:18 +0100 |
| commit | 1e0e2916047e62a7c7659d00c1282fbb145212cb (patch) | |
| tree | 85df9321cab695e2a84260a89bb088e8bbfbc4ac | |
| parent | ac74dcb4da90f708371dff98e77634a8678856a8 (diff) | |
remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on by default_pre.prf.
Change-Id: I362942adad909b718c0af7c7e44cd0c8688901c2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
101 files changed, 6 insertions, 105 deletions
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro index 1bd96cf80..9162fed40 100644 --- a/demos/qt3d/cubehouse/cubehouse.pro +++ b/demos/qt3d/cubehouse/cubehouse.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cubehouse -CONFIG += qt warn_on QT += 3d include (../../../pkg.pri) diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro index 8dc0ba588..9aff05936 100644 --- a/demos/qt3d/pageflip/pageflip.pro +++ b/demos/qt3d/pageflip/pageflip.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = pageflip -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro index 83eb2156f..72d078e85 100644 --- a/demos/qt3d/photobrowser3d/photobrowser3d.pro +++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = photobrowser3d -CONFIG += qt warn_on QT += 3d include (../../../pkg.pri) diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro index c2e3e89dc..51c6bab63 100644 --- a/demos/qt3d/shapes/shapes.pro +++ b/demos/qt3d/shapes/shapes.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = shapes -CONFIG += qt warn_on QT += 3d include (../../../pkg.pri) diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro index 60d469f25..10f864953 100644 --- a/demos/qt3d/teaservice/teaservice.pro +++ b/demos/qt3d/teaservice/teaservice.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = teaservice -CONFIG += qt warn_on QT += 3d include (../../../pkg.pri) diff --git a/demos/quick3d/flickr3d/flickr3d.pro b/demos/quick3d/flickr3d/flickr3d.pro index 3254ac1f9..73d22c99b 100644 --- a/demos/quick3d/flickr3d/flickr3d.pro +++ b/demos/quick3d/flickr3d/flickr3d.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = flickr3d QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp ICON_FILE = ../icon.png diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro index b1c81cfaf..d43bab6b5 100644 --- a/demos/quick3d/tea_service/tea_service.pro +++ b/demos/quick3d/tea_service/tea_service.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = tea_service QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp ICON_FILE = ../icon.png diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro index f7cb60232..9cad84892 100644 --- a/examples/qt3d/basket/basket.pro +++ b/examples/qt3d/basket/basket.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = basket -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro index b820221a8..277b5ed57 100644 --- a/examples/qt3d/builder/builder.pro +++ b/examples/qt3d/builder/builder.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = builder -CONFIG += qt warn_on QT += 3d diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro index 7eae07d91..75fd802f3 100644 --- a/examples/qt3d/cube/cube.pro +++ b/examples/qt3d/cube/cube.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cube -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro index 03cb2cc5f..63488d8eb 100644 --- a/examples/qt3d/cylinder/cylinder.pro +++ b/examples/qt3d/cylinder/cylinder.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cylinder -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro index 19216a6f6..d56069831 100644 --- a/examples/qt3d/geometry/geometry.pro +++ b/examples/qt3d/geometry/geometry.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = geometry -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/load_model/load_model.pro b/examples/qt3d/load_model/load_model.pro index d235a33be..b9d289229 100644 --- a/examples/qt3d/load_model/load_model.pro +++ b/examples/qt3d/load_model/load_model.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = load_model -CONFIG += qt warn_on QT += 3d diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro index fc1aba7da..2e4212a49 100644 --- a/examples/qt3d/nesting/nesting.pro +++ b/examples/qt3d/nesting/nesting.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = nesting -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro index 53fe5106c..b5952e80a 100644 --- a/examples/qt3d/solarsystem/solarsystem.pro +++ b/examples/qt3d/solarsystem/solarsystem.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = solarsystem -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro index 820feb798..19441ee9b 100644 --- a/examples/qt3d/tank/tank.pro +++ b/examples/qt3d/tank/tank.pro @@ -1,6 +1,5 @@ TARGET = tank TEMPLATE = app -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro index 13c3dc89e..d76721ae9 100644 --- a/examples/qt3d/teapot/teapot.pro +++ b/examples/qt3d/teapot/teapot.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = teapot -CONFIG += qt warn_on QT += 3d include(../../../pkg.pri) diff --git a/examples/quick3d/animations/animations.pro b/examples/quick3d/animations/animations.pro index 46cf0b616..860ed54db 100644 --- a/examples/quick3d/animations/animations.pro +++ b/examples/quick3d/animations/animations.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = animations_qml QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp diff --git a/examples/quick3d/basket/basket.pro b/examples/quick3d/basket/basket.pro index cea8edb7c..6a6c02391 100644 --- a/examples/quick3d/basket/basket.pro +++ b/examples/quick3d/basket/basket.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = basket_qml -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro index 673b9db4e..a2512a628 100644 --- a/examples/quick3d/cube/cube.pro +++ b/examples/quick3d/cube/cube.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = cube_qml QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp diff --git a/examples/quick3d/forest/forest.pro b/examples/quick3d/forest/forest.pro index e948602cb..b921a44ae 100644 --- a/examples/quick3d/forest/forest.pro +++ b/examples/quick3d/forest/forest.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = forest_qml QT += qml quick 3dquick -CONFIG += qt warn_on SOURCES += main.cpp diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro index 5c1e0806f..cd4449317 100644 --- a/examples/quick3d/lander/lander.pro +++ b/examples/quick3d/lander/lander.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = lander -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/matrix_animation/matrix_animation.pro b/examples/quick3d/matrix_animation/matrix_animation.pro index 4d21e1eae..bfa4183e3 100644 --- a/examples/quick3d/matrix_animation/matrix_animation.pro +++ b/examples/quick3d/matrix_animation/matrix_animation.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = matrix_animation -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro index 3f704a1d8..74ff5c121 100644 --- a/examples/quick3d/monkeygod/monkeygod.pro +++ b/examples/quick3d/monkeygod/monkeygod.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = monkeygod -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/moon/moon.pro b/examples/quick3d/moon/moon.pro index 18055414e..041fbc7b6 100644 --- a/examples/quick3d/moon/moon.pro +++ b/examples/quick3d/moon/moon.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = moon -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/photoroom/photoroom.pro b/examples/quick3d/photoroom/photoroom.pro index 24478fb7d..3982bfb29 100644 --- a/examples/quick3d/photoroom/photoroom.pro +++ b/examples/quick3d/photoroom/photoroom.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = photoroom -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/positional_lighting/positional_lighting.pro b/examples/quick3d/positional_lighting/positional_lighting.pro index ef11c3d2f..6a0ff1853 100644 --- a/examples/quick3d/positional_lighting/positional_lighting.pro +++ b/examples/quick3d/positional_lighting/positional_lighting.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = positional_lighting -CONFIG += qt warn_on QT += qml quick 3d 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro index cb8569f1d..207ebc3e8 100644 --- a/examples/quick3d/shaders/shaders.pro +++ b/examples/quick3d/shaders/shaders.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = shaders -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/examples/quick3d/solarsystem_qml/solarsystem_qml.pro b/examples/quick3d/solarsystem_qml/solarsystem_qml.pro index 0baedc0ca..6b6ef2a3e 100644 --- a/examples/quick3d/solarsystem_qml/solarsystem_qml.pro +++ b/examples/quick3d/solarsystem_qml/solarsystem_qml.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = solarsystem_qml -CONFIG += qt warn_on INSTALL_DIRS = qml CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg diff --git a/examples/quick3d/sphere/sphere.pro b/examples/quick3d/sphere/sphere.pro index 5a79ef8a9..6c84d9e38 100644 --- a/examples/quick3d/sphere/sphere.pro +++ b/examples/quick3d/sphere/sphere.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = sphere -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro index 59fb508e1..03cdd285d 100644 --- a/src/quick3d/quick3d.pro +++ b/src/quick3d/quick3d.pro @@ -6,11 +6,11 @@ QT_PRIVATE = network load(qt_module) gcov { - CONFIG += static warn_on + CONFIG += static QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage } else { - CONFIG += dll warn_on + CONFIG += dll } # Use this define to set a data directory into which QML resources diff --git a/src/threed/threed.pro b/src/threed/threed.pro index bd6c3eb25..793c1602a 100644 --- a/src/threed/threed.pro +++ b/src/threed/threed.pro @@ -8,11 +8,11 @@ load(qt_module) QMAKE_DOCS = $$PWD/doc/qt3d.qdocconf gcov { - CONFIG += static warn_on + CONFIG += static QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage } else { - CONFIG += dll warn_on + CONFIG += dll } # otherwise mingw headers do not declare common functions like ::strcasecmp diff --git a/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro b/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro index 272280cef..01a64ff39 100644 --- a/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro +++ b/tests/auto/imports/qcapsulemesh/qcapsulemesh.pro @@ -3,7 +3,6 @@ CONFIG += testcase TEMPLATE=app QT += testlib 3d 3dquick QT += qml quick -CONFIG += warn_on SOURCES += tst_qcapsulemesh.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qcylindermesh/qcylindermesh.pro b/tests/auto/imports/qcylindermesh/qcylindermesh.pro index d42a32db2..b56110078 100644 --- a/tests/auto/imports/qcylindermesh/qcylindermesh.pro +++ b/tests/auto/imports/qcylindermesh/qcylindermesh.pro @@ -3,7 +3,6 @@ CONFIG += testcase TEMPLATE=app QT += testlib 3d 3dquick QT += qml quick -CONFIG += warn_on SOURCES += tst_qcylindermesh.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qline/qline.pro b/tests/auto/imports/qline/qline.pro index 484d729b8..b87c079ca 100644 --- a/tests/auto/imports/qline/qline.pro +++ b/tests/auto/imports/qline/qline.pro @@ -3,7 +3,6 @@ CONFIG += testcase TEMPLATE=app QT += testlib 3d 3dquick QT += qml quick -CONFIG += warn_on SOURCES += tst_qline.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qpoint/qpoint.pro b/tests/auto/imports/qpoint/qpoint.pro index f214afd3b..29a783ee8 100644 --- a/tests/auto/imports/qpoint/qpoint.pro +++ b/tests/auto/imports/qpoint/qpoint.pro @@ -3,7 +3,6 @@ CONFIG += testcase TEMPLATE=app QT += testlib 3d 3dquick QT += qml quick -CONFIG += warn_on SOURCES += tst_qpoint.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/imports/qspheremesh/qspheremesh.pro b/tests/auto/imports/qspheremesh/qspheremesh.pro index 65f40033b..42af015f8 100644 --- a/tests/auto/imports/qspheremesh/qspheremesh.pro +++ b/tests/auto/imports/qspheremesh/qspheremesh.pro @@ -3,7 +3,6 @@ CONFIG += testcase TEMPLATE=app QT += testlib 3d 3dquick QT += qml quick -CONFIG += warn_on SOURCES += tst_qspheremesh.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml3d/qml3d.pro b/tests/auto/qml3d/qml3d.pro index 57529ee9b..ce9144c5a 100644 --- a/tests/auto/qml3d/qml3d.pro +++ b/tests/auto/qml3d/qml3d.pro @@ -1,6 +1,6 @@ TEMPLATE=app TARGET=tst_qml3d -CONFIG += warn_on qmltestcase +CONFIG += qmltestcase QT += qml opengl SOURCES += tst_qml3d.cpp diff --git a/tests/auto/qml3d_visual/qml3d_visual.pro b/tests/auto/qml3d_visual/qml3d_visual.pro index b1bb24d6a..d27193503 100644 --- a/tests/auto/qml3d_visual/qml3d_visual.pro +++ b/tests/auto/qml3d_visual/qml3d_visual.pro @@ -1,6 +1,6 @@ TEMPLATE=app TARGET=tst_qml3d_visual -CONFIG += warn_on qmltestcase +CONFIG += qmltestcase QT += qml opengl SOURCES += tst_qml3d_visual.cpp diff --git a/tests/auto/threed/load_model/load_model.pro b/tests/auto/threed/load_model/load_model.pro index 26b0d6192..674c65b81 100644 --- a/tests/auto/threed/load_model/load_model.pro +++ b/tests/auto/threed/load_model/load_model.pro @@ -2,7 +2,6 @@ TARGET = tst_load_model CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_load_model.cpp diff --git a/tests/auto/threed/qareaallocator/qareaallocator.pro b/tests/auto/threed/qareaallocator/qareaallocator.pro index a443875e0..2870e7181 100644 --- a/tests/auto/threed/qareaallocator/qareaallocator.pro +++ b/tests/auto/threed/qareaallocator/qareaallocator.pro @@ -2,7 +2,6 @@ TARGET = tst_qareaallocator CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qareaallocator.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qarray/qarray.pro b/tests/auto/threed/qarray/qarray.pro index 773622d5f..6d38b2ff5 100644 --- a/tests/auto/threed/qarray/qarray.pro +++ b/tests/auto/threed/qarray/qarray.pro @@ -2,7 +2,6 @@ TARGET = tst_qarray CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qarray.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qbox3d/qbox3d.pro b/tests/auto/threed/qbox3d/qbox3d.pro index 645e8c846..8b9119c60 100644 --- a/tests/auto/threed/qbox3d/qbox3d.pro +++ b/tests/auto/threed/qbox3d/qbox3d.pro @@ -2,7 +2,6 @@ TARGET = tst_qbox3d CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qbox3d.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qcolor4ub/qcolor4ub.pro b/tests/auto/threed/qcolor4ub/qcolor4ub.pro index 5bc08f553..d4349d202 100644 --- a/tests/auto/threed/qcolor4ub/qcolor4ub.pro +++ b/tests/auto/threed/qcolor4ub/qcolor4ub.pro @@ -2,7 +2,6 @@ TARGET = tst_qcolor4ub CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qcolor4ub.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro b/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro index ee89d639e..5c0ae411e 100644 --- a/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro +++ b/tests/auto/threed/qcustomdataarray/qcustomdataarray.pro @@ -2,7 +2,6 @@ TARGET = tst_qcustomdataarray CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qcustomdataarray.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgeometrydata/qgeometrydata.pro b/tests/auto/threed/qgeometrydata/qgeometrydata.pro index 1f4b2d3e7..f3c20dfa2 100644 --- a/tests/auto/threed/qgeometrydata/qgeometrydata.pro +++ b/tests/auto/threed/qgeometrydata/qgeometrydata.pro @@ -2,7 +2,6 @@ TARGET = tst_qgeometrydata CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared INCLUDEPATH += ../../../../src/threed/geometry diff --git a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro index 2ee122fe2..e9362e683 100644 --- a/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro +++ b/tests/auto/threed/qglabstractsurface/qglabstractsurface.pro @@ -2,7 +2,6 @@ TARGET = tst_qglabstractsurface CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qglabstractsurface.cpp diff --git a/tests/auto/threed/qglattributedescription/qglattributedescription.pro b/tests/auto/threed/qglattributedescription/qglattributedescription.pro index e2e5d7457..22157f92b 100644 --- a/tests/auto/threed/qglattributedescription/qglattributedescription.pro +++ b/tests/auto/threed/qglattributedescription/qglattributedescription.pro @@ -2,7 +2,6 @@ TARGET = tst_qglattributedescription CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../../threed/viewing VPATH += ../../../../threed/viewing diff --git a/tests/auto/threed/qglattributeset/qglattributeset.pro b/tests/auto/threed/qglattributeset/qglattributeset.pro index 5d0603802..0818a118b 100644 --- a/tests/auto/threed/qglattributeset/qglattributeset.pro +++ b/tests/auto/threed/qglattributeset/qglattributeset.pro @@ -2,7 +2,6 @@ TARGET = tst_qglattributeset CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qglattributeset.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglattributevalue/qglattributevalue.pro b/tests/auto/threed/qglattributevalue/qglattributevalue.pro index 0d84406b1..057eff29a 100644 --- a/tests/auto/threed/qglattributevalue/qglattributevalue.pro +++ b/tests/auto/threed/qglattributevalue/qglattributevalue.pro @@ -2,7 +2,6 @@ TARGET = tst_qglattributevalue CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../../threed/viewing VPATH += ../../../../threed/viewing diff --git a/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro b/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro index 63677741d..920e044d6 100644 --- a/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro +++ b/tests/auto/threed/qglbezierpatches/qglbezierpatches.pro @@ -2,7 +2,6 @@ TARGET = tst_qglbezierpatches CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qglbezierpatches.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglbuilder/qglbuilder.pro b/tests/auto/threed/qglbuilder/qglbuilder.pro index 8c365c215..ec1f11626 100644 --- a/tests/auto/threed/qglbuilder/qglbuilder.pro +++ b/tests/auto/threed/qglbuilder/qglbuilder.pro @@ -2,7 +2,6 @@ TARGET = tst_qglbuilder CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglbuilder.cpp diff --git a/tests/auto/threed/qglcamera/qglcamera.pro b/tests/auto/threed/qglcamera/qglcamera.pro index a06d35c5b..71b41cc3f 100644 --- a/tests/auto/threed/qglcamera/qglcamera.pro +++ b/tests/auto/threed/qglcamera/qglcamera.pro @@ -2,7 +2,6 @@ TARGET = tst_qglcamera CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../../threed/viewing VPATH += ../../../../threed/viewing diff --git a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro index 2f3df5ba4..882efc47e 100644 --- a/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro +++ b/tests/auto/threed/qglcameraanimation/qglcameraanimation.pro @@ -2,7 +2,6 @@ TARGET = tst_qglcameraanimation CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../../threed/viewing VPATH += ../../../../threed/viewing diff --git a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro index 0ef9cea71..dbb2a7dc2 100644 --- a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro +++ b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro @@ -3,8 +3,6 @@ CONFIG += testcase TEMPLATE = app QT += testlib 3d -CONFIG += warn_on - INCLUDEPATH += ../../../../demos/shaderwizard/ VPATH += ../../../../demos/shaderwizard/ diff --git a/tests/auto/threed/qglcube/qglcube.pro b/tests/auto/threed/qglcube/qglcube.pro index dd4edcacc..8f8a6e01f 100644 --- a/tests/auto/threed/qglcube/qglcube.pro +++ b/tests/auto/threed/qglcube/qglcube.pro @@ -2,7 +2,6 @@ TARGET = tst_qglcube CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglcube.cpp diff --git a/tests/auto/threed/qglcylinder/qglcylinder.pro b/tests/auto/threed/qglcylinder/qglcylinder.pro index 34effeaf1..1436b8949 100644 --- a/tests/auto/threed/qglcylinder/qglcylinder.pro +++ b/tests/auto/threed/qglcylinder/qglcylinder.pro @@ -2,7 +2,6 @@ TARGET = tst_qglcylinder CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglcylinder.cpp diff --git a/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro b/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro index c804f1000..d8a072fd3 100644 --- a/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro +++ b/tests/auto/threed/qglindexbuffer/qglindexbuffer.pro @@ -2,7 +2,6 @@ TARGET = tst_qglindexbuffer CONFIG += testcase TEMPLATE=app QT += testlib 3d opengl -CONFIG += warn_on SOURCES += tst_qglindexbuffer.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgllightmodel/qgllightmodel.pro b/tests/auto/threed/qgllightmodel/qgllightmodel.pro index e61381bbf..67312b43a 100644 --- a/tests/auto/threed/qgllightmodel/qgllightmodel.pro +++ b/tests/auto/threed/qgllightmodel/qgllightmodel.pro @@ -2,7 +2,6 @@ TARGET = tst_qgllightmodel CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qgllightmodel.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgllightparameters/qgllightparameters.pro b/tests/auto/threed/qgllightparameters/qgllightparameters.pro index e940e4e75..d4bd1a7c1 100644 --- a/tests/auto/threed/qgllightparameters/qgllightparameters.pro +++ b/tests/auto/threed/qgllightparameters/qgllightparameters.pro @@ -2,7 +2,6 @@ TARGET = tst_qgllightparameters CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qgllightparameters.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglmaterial/qglmaterial.pro b/tests/auto/threed/qglmaterial/qglmaterial.pro index fcefbe64f..19da72ff5 100644 --- a/tests/auto/threed/qglmaterial/qglmaterial.pro +++ b/tests/auto/threed/qglmaterial/qglmaterial.pro @@ -2,7 +2,6 @@ TARGET = tst_qglmaterial CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on CONFIG += insignificant_test # See QTBUG-25757 SOURCES += tst_qglmaterial.cpp diff --git a/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro b/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro index 8e0a5ed74..5ca4f1e4e 100644 --- a/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro +++ b/tests/auto/threed/qglmaterialcollection/qglmaterialcollection.pro @@ -2,7 +2,6 @@ TARGET = tst_qglmaterialcollection CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qglmaterialcollection.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglpainter/qglpainter.pro b/tests/auto/threed/qglpainter/qglpainter.pro index 1a7fd7266..be43624c3 100644 --- a/tests/auto/threed/qglpainter/qglpainter.pro +++ b/tests/auto/threed/qglpainter/qglpainter.pro @@ -2,7 +2,6 @@ TARGET = tst_qglpainter CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared VPATH += ../../../shared diff --git a/tests/auto/threed/qglpickcolors/qglpickcolors.pro b/tests/auto/threed/qglpickcolors/qglpickcolors.pro index c0abf6a7d..c2efb1404 100644 --- a/tests/auto/threed/qglpickcolors/qglpickcolors.pro +++ b/tests/auto/threed/qglpickcolors/qglpickcolors.pro @@ -2,7 +2,6 @@ TARGET = tst_qglpickcolors CONFIG += testcase TEMPLATE=app QT += testlib -CONFIG += warn_on INCLUDEPATH += ../../../../src/threed/painting VPATH += ../../../../src/threed/painting diff --git a/tests/auto/threed/qglrender/qglrender.pro b/tests/auto/threed/qglrender/qglrender.pro index 85d0e5e99..abb2044a4 100644 --- a/tests/auto/threed/qglrender/qglrender.pro +++ b/tests/auto/threed/qglrender/qglrender.pro @@ -2,7 +2,6 @@ TARGET = tst_qglrender CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qglrender.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qglscenenode/qglscenenode.pro b/tests/auto/threed/qglscenenode/qglscenenode.pro index 51886eb11..d3fda5ddd 100644 --- a/tests/auto/threed/qglscenenode/qglscenenode.pro +++ b/tests/auto/threed/qglscenenode/qglscenenode.pro @@ -2,7 +2,6 @@ TARGET = tst_qglscenenode CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglscenenode.cpp diff --git a/tests/auto/threed/qglsection/qglsection.pro b/tests/auto/threed/qglsection/qglsection.pro index 6d9098599..2dfa28de2 100644 --- a/tests/auto/threed/qglsection/qglsection.pro +++ b/tests/auto/threed/qglsection/qglsection.pro @@ -2,7 +2,6 @@ TARGET = tst_qglsection CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglsection.cpp diff --git a/tests/auto/threed/qglsphere/qglsphere.pro b/tests/auto/threed/qglsphere/qglsphere.pro index 9cfb564a1..70c1d606d 100644 --- a/tests/auto/threed/qglsphere/qglsphere.pro +++ b/tests/auto/threed/qglsphere/qglsphere.pro @@ -2,7 +2,6 @@ TARGET = tst_qglsphere CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on INCLUDEPATH += ../../../shared SOURCES += tst_qglsphere.cpp diff --git a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro index fd8b07168..187f11719 100644 --- a/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro +++ b/tests/auto/threed/qglvertexbundle/qglvertexbundle.pro @@ -2,7 +2,6 @@ TARGET = tst_qglvertexbundle CONFIG += testcase TEMPLATE=app QT += testlib 3d opengl -CONFIG += warn_on SOURCES += tst_qglvertexbundle.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro b/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro index 3907613b5..ae2abf843 100644 --- a/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro +++ b/tests/auto/threed/qgraphicstransform3d/qgraphicstransform3d.pro @@ -2,7 +2,6 @@ TARGET = tst_qgraphicstransform3d CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qgraphicstransform3d.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qplane3d/qplane3d.pro b/tests/auto/threed/qplane3d/qplane3d.pro index 6899d04e9..40b37aabd 100644 --- a/tests/auto/threed/qplane3d/qplane3d.pro +++ b/tests/auto/threed/qplane3d/qplane3d.pro @@ -2,7 +2,6 @@ TARGET = tst_qplane3d CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qplane3d.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qray3d/qray3d.pro b/tests/auto/threed/qray3d/qray3d.pro index 676f46e72..c1ae47001 100644 --- a/tests/auto/threed/qray3d/qray3d.pro +++ b/tests/auto/threed/qray3d/qray3d.pro @@ -2,7 +2,6 @@ TARGET = tst_qray3d CONFIG += testcase TEMPLATE = app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qray3d.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 CONFIG+=insignificant_test # See QTBUG-27189 diff --git a/tests/auto/threed/qsphere3d/qsphere3d.pro b/tests/auto/threed/qsphere3d/qsphere3d.pro index 747a72b64..caf7f36a0 100644 --- a/tests/auto/threed/qsphere3d/qsphere3d.pro +++ b/tests/auto/threed/qsphere3d/qsphere3d.pro @@ -2,6 +2,5 @@ TARGET = tst_qsphere3d CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qsphere3d.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qstereoimage/qstereoimage.pro b/tests/auto/threed/qstereoimage/qstereoimage.pro index cfdf3753f..997982263 100644 --- a/tests/auto/threed/qstereoimage/qstereoimage.pro +++ b/tests/auto/threed/qstereoimage/qstereoimage.pro @@ -2,7 +2,6 @@ TARGET = tst_qstereoimage CONFIG += testcase TEMPLATE=app QT += testlib -CONFIG += warn_on INCLUDEPATH += ../../../../examples/stereophoto VPATH += ../../../../examples/stereophoto diff --git a/tests/auto/threed/qtriangle3d/qtriangle3d.pro b/tests/auto/threed/qtriangle3d/qtriangle3d.pro index b71b00fc2..07de54306 100644 --- a/tests/auto/threed/qtriangle3d/qtriangle3d.pro +++ b/tests/auto/threed/qtriangle3d/qtriangle3d.pro @@ -2,7 +2,6 @@ TARGET = tst_qtriangle3d CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qtriangle3d.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/threed/qvectorarray/qvectorarray.pro b/tests/auto/threed/qvectorarray/qvectorarray.pro index 9f54c3079..3ce3206a2 100644 --- a/tests/auto/threed/qvectorarray/qvectorarray.pro +++ b/tests/auto/threed/qvectorarray/qvectorarray.pro @@ -3,8 +3,6 @@ CONFIG += testcase TEMPLATE=app QT += testlib 3d -CONFIG += warn_on - INCLUDEPATH += ../../../shared SOURCES += tst_qvectorarray.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qarray/qarray.pro b/tests/benchmarks/qarray/qarray.pro index 018c7a5cc..01048b386 100644 --- a/tests/benchmarks/qarray/qarray.pro +++ b/tests/benchmarks/qarray/qarray.pro @@ -1,6 +1,5 @@ TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qarray.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro b/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro index ac839fb8f..b760b5bcc 100644 --- a/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro +++ b/tests/benchmarks/qglbuilder_perf/qglbuilder_perf.pro @@ -1,6 +1,5 @@ TEMPLATE=app QT += testlib 3d -CONFIG += warn_on SOURCES += tst_qglbuilder_perf.cpp INCLUDEPATH += ../../../src/threed/geometry diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro index e9c660a11..5947dc3cb 100644 --- a/tests/manual/animations/animations.pro +++ b/tests/manual/animations/animations.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_animations -CONFIG += qt warn_on QT += 3dquick qml diff --git a/tests/manual/background/background.pro b/tests/manual/background/background.pro index 9d351720e..749e6cb50 100644 --- a/tests/manual/background/background.pro +++ b/tests/manual/background/background.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_background -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/tests/manual/basic/basic.pro b/tests/manual/basic/basic.pro index e42ba083e..47b809a38 100644 --- a/tests/manual/basic/basic.pro +++ b/tests/manual/basic/basic.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_basic -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro index 81d1020a9..0c72abfa3 100644 --- a/tests/manual/displaymodel/displaymodel.pro +++ b/tests/manual/displaymodel/displaymodel.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_displaymodel -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/fullreferencing/fullreferencing.pro b/tests/manual/fullreferencing/fullreferencing.pro index 86cb3a5ec..36f52e0d9 100644 --- a/tests/manual/fullreferencing/fullreferencing.pro +++ b/tests/manual/fullreferencing/fullreferencing.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_fullreferencing -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro index c5e00e6a6..c140e52fc 100644 --- a/tests/manual/model3ds/model3ds.pro +++ b/tests/manual/model3ds/model3ds.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_model3ds -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro index b26b70a9b..f6a281823 100644 --- a/tests/manual/navigation1/navigation1.pro +++ b/tests/manual/navigation1/navigation1.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_navigation1 -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro index 2a084a69b..5b737f2a0 100644 --- a/tests/manual/qrc/qrc.pro +++ b/tests/manual/qrc/qrc.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_qrc -CONFIG += qt warn_on # This manual test is to confirm the functionality of running # Qt3D QML apps from a Qt resource (or *.qrc) file. diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro index f3a63308e..2b6e58311 100644 --- a/tests/manual/rotation/rotation.pro +++ b/tests/manual/rotation/rotation.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_rotation -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro index 00518798f..1de60a170 100644 --- a/tests/manual/scaling/scaling.pro +++ b/tests/manual/scaling/scaling.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_scaling -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/shapes/shapes.pro b/tests/manual/shapes/shapes.pro index 5b556a5d7..b29dfa4d8 100644 --- a/tests/manual/shapes/shapes.pro +++ b/tests/manual/shapes/shapes.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_shapes -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro index 9d5e7af83..5b0efae09 100644 --- a/tests/manual/submesh/submesh.pro +++ b/tests/manual/submesh/submesh.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_submesh -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro index 3968a7225..83fb18da4 100644 --- a/tests/manual/transformations/transformations.pro +++ b/tests/manual/transformations/transformations.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_transformations -CONFIG += qt warn_on QT += 3dquick diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro index a2119bdb3..65362308b 100644 --- a/tests/manual/translation/translation.pro +++ b/tests/manual/translation/translation.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = tst_translation -CONFIG += qt warn_on QT += 3dquick diff --git a/tutorials/qt3d/cube1/cube1.pro b/tutorials/qt3d/cube1/cube1.pro index 46c44bba1..959905478 100644 --- a/tutorials/qt3d/cube1/cube1.pro +++ b/tutorials/qt3d/cube1/cube1.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cube1 -CONFIG += qt warn_on QT += 3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h diff --git a/tutorials/qt3d/cube2/cube2.pro b/tutorials/qt3d/cube2/cube2.pro index 855117f33..a50ed64a2 100644 --- a/tutorials/qt3d/cube2/cube2.pro +++ b/tutorials/qt3d/cube2/cube2.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cube2 -CONFIG += qt warn_on QT += 3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h diff --git a/tutorials/qt3d/cube3/cube3.pro b/tutorials/qt3d/cube3/cube3.pro index 0dadf9673..b0daf31af 100644 --- a/tutorials/qt3d/cube3/cube3.pro +++ b/tutorials/qt3d/cube3/cube3.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cube3 -CONFIG += qt warn_on QT += 3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h diff --git a/tutorials/qt3d/cube4/cube4.pro b/tutorials/qt3d/cube4/cube4.pro index 24381eee0..0d7031fd8 100644 --- a/tutorials/qt3d/cube4/cube4.pro +++ b/tutorials/qt3d/cube4/cube4.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cube4 -CONFIG += qt warn_on QT += 3d SOURCES = cubeview.cpp main.cpp HEADERS = cubeview.h diff --git a/tutorials/qt3d/penguin/penguin.pro b/tutorials/qt3d/penguin/penguin.pro index 7274755ba..34b78468c 100644 --- a/tutorials/qt3d/penguin/penguin.pro +++ b/tutorials/qt3d/penguin/penguin.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = penguin -CONFIG += qt warn_on QT += 3d SOURCES = modelview.cpp \ main.cpp diff --git a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro index d1ae29878..4ef6a60c8 100644 --- a/tutorials/qt3d/penguin_advanced/penguin_advanced.pro +++ b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = penguin_advanced -CONFIG += qt warn_on QT += 3d SOURCES = modelview.cpp \ main.cpp diff --git a/tutorials/quick3d/shadertut/shadertut.pro b/tutorials/quick3d/shadertut/shadertut.pro index 9d7665ac2..38beee3b8 100644 --- a/tutorials/quick3d/shadertut/shadertut.pro +++ b/tutorials/quick3d/shadertut/shadertut.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = shadertut -CONFIG += qt warn_on QT += qml quick 3dquick SOURCES += main.cpp diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro index 129763073..5f83ddc2a 100644 --- a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro +++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = teapot_bounce_qml -CONFIG += qt warn_on QT += qml quick 3dquick diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.pro b/tutorials/quick3d/teapot_qml/teapot_qml.pro index 50d7cc8bb..cb1c2216d 100644 --- a/tutorials/quick3d/teapot_qml/teapot_qml.pro +++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = teapot_qml -CONFIG += qt warn_on QT += 3dquick quick |