diff options
author | Kai Köhne <kai.koehne@qt.io> | 2023-05-22 14:19:39 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-14 05:43:25 +0000 |
commit | dc0e17fa64bc77b803d28947767f6296c8bc804e (patch) | |
tree | 19deeedfc019e86c2af0314a41e07af888040be0 | |
parent | e684a7a159ef889a9bc11b59d111dd4325281baf (diff) |
Examples: Remove unnecessary Q_INIT_RESOURCE calls
Explicit calls to Q_INIT_RESOURCE are only needed for
resources embedded in static libraries. See also
https://doc.qt.io/qt-6/resources.html#explicit-loading-and-unloading-of-embedded-resources
Change-Id: I06a24d1c04369eedc78ca60a6ca02ce33907d9e7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit eed17b3634a99b6f6f751830c6443094dd6b600b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
46 files changed, 0 insertions, 90 deletions
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp index 6a5eb55d99..f9d4b6e0c3 100644 --- a/examples/embedded/flightinfo/flightinfo.cpp +++ b/examples/embedded/flightinfo/flightinfo.cpp @@ -342,8 +342,6 @@ private: int main(int argc, char **argv) { - Q_INIT_RESOURCE(flightinfo); - QApplication app(argc, argv); FlightInfo w; diff --git a/examples/embedded/styleexample/main.cpp b/examples/embedded/styleexample/main.cpp index 2a7577e845..dba57e2d52 100644 --- a/examples/embedded/styleexample/main.cpp +++ b/examples/embedded/styleexample/main.cpp @@ -7,7 +7,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - Q_INIT_RESOURCE(styleexample); app.setApplicationName("style"); app.setOrganizationName("QtProject"); diff --git a/examples/network/securesocketclient/main.cpp b/examples/network/securesocketclient/main.cpp index 5898bf0878..7a59e6f774 100644 --- a/examples/network/securesocketclient/main.cpp +++ b/examples/network/securesocketclient/main.cpp @@ -11,8 +11,6 @@ QT_REQUIRE_CONFIG(ssl); int main(int argc, char **argv) { - Q_INIT_RESOURCE(securesocketclient); - QApplication app(argc, argv); if (!QSslSocket::supportsSsl()) { diff --git a/examples/network/torrent/main.cpp b/examples/network/torrent/main.cpp index a7a795fbcc..649f33436a 100644 --- a/examples/network/torrent/main.cpp +++ b/examples/network/torrent/main.cpp @@ -9,8 +9,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - Q_INIT_RESOURCE(icons); - MainWindow window; window.show(); diff --git a/examples/opengl/textures/main.cpp b/examples/opengl/textures/main.cpp index c1e91e6257..7e5f0646cb 100644 --- a/examples/opengl/textures/main.cpp +++ b/examples/opengl/textures/main.cpp @@ -8,8 +8,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(textures); - QApplication app(argc, argv); QSurfaceFormat format; diff --git a/examples/sql/books/main.cpp b/examples/sql/books/main.cpp index d06568ed36..e65ac93642 100644 --- a/examples/sql/books/main.cpp +++ b/examples/sql/books/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char * argv[]) { - Q_INIT_RESOURCE(books); - QApplication app(argc, argv); BookWindow win; diff --git a/examples/sql/drilldown/main.cpp b/examples/sql/drilldown/main.cpp index 5828a37aab..77b8725281 100644 --- a/examples/sql/drilldown/main.cpp +++ b/examples/sql/drilldown/main.cpp @@ -11,8 +11,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(drilldown); - QApplication app(argc, argv); if (!createConnection()) diff --git a/examples/sql/masterdetail/main.cpp b/examples/sql/masterdetail/main.cpp index 8b6ee61828..e99d8e8645 100644 --- a/examples/sql/masterdetail/main.cpp +++ b/examples/sql/masterdetail/main.cpp @@ -11,8 +11,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(masterdetail); - QApplication app(argc, argv); if (!createConnection()) diff --git a/examples/widgets/animation/easing/main.cpp b/examples/widgets/animation/easing/main.cpp index a1c01698d1..26009a6bf7 100644 --- a/examples/widgets/animation/easing/main.cpp +++ b/examples/widgets/animation/easing/main.cpp @@ -6,7 +6,6 @@ int main(int argc, char **argv) { - Q_INIT_RESOURCE(easing); QApplication app(argc, argv); Window w; diff --git a/examples/widgets/desktop/systray/main.cpp b/examples/widgets/desktop/systray/main.cpp index d01f813d2f..d13bde11ce 100644 --- a/examples/widgets/desktop/systray/main.cpp +++ b/examples/widgets/desktop/systray/main.cpp @@ -10,8 +10,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(systray); - QApplication app(argc, argv); if (!QSystemTrayIcon::isSystemTrayAvailable()) { diff --git a/examples/widgets/dialogs/licensewizard/main.cpp b/examples/widgets/dialogs/licensewizard/main.cpp index 13e13f0e32..d16b5dc6d1 100644 --- a/examples/widgets/dialogs/licensewizard/main.cpp +++ b/examples/widgets/dialogs/licensewizard/main.cpp @@ -10,8 +10,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(licensewizard); - QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION diff --git a/examples/widgets/draganddrop/draggableicons/main.cpp b/examples/widgets/draganddrop/draggableicons/main.cpp index cd22e4e394..fe92708594 100644 --- a/examples/widgets/draganddrop/draggableicons/main.cpp +++ b/examples/widgets/draganddrop/draggableicons/main.cpp @@ -8,8 +8,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(draggableicons); - QApplication app(argc, argv); QWidget mainWidget; diff --git a/examples/widgets/draganddrop/draggabletext/main.cpp b/examples/widgets/draganddrop/draggabletext/main.cpp index f6ab39aee1..ebfd481e62 100644 --- a/examples/widgets/draganddrop/draggabletext/main.cpp +++ b/examples/widgets/draganddrop/draggabletext/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(draggabletext); - QApplication app(argc, argv); DragWidget window; window.show(); diff --git a/examples/widgets/draganddrop/fridgemagnets/main.cpp b/examples/widgets/draganddrop/fridgemagnets/main.cpp index d2b2e5dbed..d3ffc82650 100644 --- a/examples/widgets/draganddrop/fridgemagnets/main.cpp +++ b/examples/widgets/draganddrop/fridgemagnets/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(fridgemagnets); - QApplication app(argc, argv); #ifdef QT_KEYPAD_NAVIGATION QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); diff --git a/examples/widgets/draganddrop/puzzle/main.cpp b/examples/widgets/draganddrop/puzzle/main.cpp index 73fdd6513b..32e219256a 100644 --- a/examples/widgets/draganddrop/puzzle/main.cpp +++ b/examples/widgets/draganddrop/puzzle/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(puzzle); - QApplication app(argc, argv); MainWindow window; window.loadImage(QStringLiteral(":/images/example.jpg")); diff --git a/examples/widgets/graphicsview/chip/main.cpp b/examples/widgets/graphicsview/chip/main.cpp index bf75db6a93..4ccd66bbb9 100644 --- a/examples/widgets/graphicsview/chip/main.cpp +++ b/examples/widgets/graphicsview/chip/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(images); - QApplication app(argc, argv); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); diff --git a/examples/widgets/graphicsview/diagramscene/main.cpp b/examples/widgets/graphicsview/diagramscene/main.cpp index 56310b1751..699c33f079 100644 --- a/examples/widgets/graphicsview/diagramscene/main.cpp +++ b/examples/widgets/graphicsview/diagramscene/main.cpp @@ -7,8 +7,6 @@ int main(int argv, char *args[]) { - Q_INIT_RESOURCE(diagramscene); - QApplication app(argv, args); MainWindow mainWindow; mainWindow.setGeometry(100, 100, 800, 500); diff --git a/examples/widgets/graphicsview/embeddeddialogs/main.cpp b/examples/widgets/graphicsview/embeddeddialogs/main.cpp index f022b74814..700c6b1222 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/main.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/main.cpp @@ -10,7 +10,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(embeddeddialogs); QApplication app(argc, argv); QGraphicsScene scene; diff --git a/examples/widgets/itemviews/chart/main.cpp b/examples/widgets/itemviews/chart/main.cpp index 14c3348099..7d7cf3e573 100644 --- a/examples/widgets/itemviews/chart/main.cpp +++ b/examples/widgets/itemviews/chart/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(chart); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/itemviews/editabletreemodel/main.cpp b/examples/widgets/itemviews/editabletreemodel/main.cpp index b7e7b3de1c..40a8fa104c 100644 --- a/examples/widgets/itemviews/editabletreemodel/main.cpp +++ b/examples/widgets/itemviews/editabletreemodel/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(editabletreemodel); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/itemviews/frozencolumn/main.cpp b/examples/widgets/itemviews/frozencolumn/main.cpp index 901db76dd8..8cc4a1d774 100644 --- a/examples/widgets/itemviews/frozencolumn/main.cpp +++ b/examples/widgets/itemviews/frozencolumn/main.cpp @@ -10,8 +10,6 @@ int main(int argc, char* argv[]) { - Q_INIT_RESOURCE(grades); - QApplication app( argc, argv ); QStandardItemModel *model=new QStandardItemModel(); @@ -46,4 +44,3 @@ int main(int argc, char* argv[]) tableView->show(); return app.exec(); } - diff --git a/examples/widgets/itemviews/interview/main.cpp b/examples/widgets/itemviews/interview/main.cpp index 4707c9d2c8..3446ff1dc4 100644 --- a/examples/widgets/itemviews/interview/main.cpp +++ b/examples/widgets/itemviews/interview/main.cpp @@ -12,8 +12,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(interview); - QApplication app(argc, argv); QSplitter page; diff --git a/examples/widgets/itemviews/pixelator/main.cpp b/examples/widgets/itemviews/pixelator/main.cpp index b5967311ab..26783b02fc 100644 --- a/examples/widgets/itemviews/pixelator/main.cpp +++ b/examples/widgets/itemviews/pixelator/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(images); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/itemviews/puzzle/main.cpp b/examples/widgets/itemviews/puzzle/main.cpp index 73fdd6513b..32e219256a 100644 --- a/examples/widgets/itemviews/puzzle/main.cpp +++ b/examples/widgets/itemviews/puzzle/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(puzzle); - QApplication app(argc, argv); MainWindow window; window.loadImage(QStringLiteral(":/images/example.jpg")); diff --git a/examples/widgets/itemviews/simpletreemodel/main.cpp b/examples/widgets/itemviews/simpletreemodel/main.cpp index 10075a18e5..ee8edb7c13 100644 --- a/examples/widgets/itemviews/simpletreemodel/main.cpp +++ b/examples/widgets/itemviews/simpletreemodel/main.cpp @@ -9,8 +9,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(simpletreemodel); - QApplication app(argc, argv); QFile file(":/default.txt"); diff --git a/examples/widgets/itemviews/spreadsheet/main.cpp b/examples/widgets/itemviews/spreadsheet/main.cpp index 13bd0c93fc..3c2d676e88 100644 --- a/examples/widgets/itemviews/spreadsheet/main.cpp +++ b/examples/widgets/itemviews/spreadsheet/main.cpp @@ -8,8 +8,6 @@ int main(int argc, char **argv) { - Q_INIT_RESOURCE(spreadsheet); - QApplication app(argc, argv); SpreadSheet sheet(10, 6); sheet.setWindowIcon(QPixmap(":/images/interview.png")); @@ -17,5 +15,3 @@ int main(int argc, char **argv) sheet.layout()->setSizeConstraint(QLayout::SetFixedSize); return app.exec(); } - - diff --git a/examples/widgets/mainwindows/dockwidgets/main.cpp b/examples/widgets/mainwindows/dockwidgets/main.cpp index 35ed609035..431d7dae98 100644 --- a/examples/widgets/mainwindows/dockwidgets/main.cpp +++ b/examples/widgets/mainwindows/dockwidgets/main.cpp @@ -8,7 +8,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - Q_INIT_RESOURCE(dockwidgets); MainWindow mainWin; mainWin.show(); return app.exec(); diff --git a/examples/widgets/mainwindows/mdi/main.cpp b/examples/widgets/mainwindows/mdi/main.cpp index 09f3082201..ee70050544 100644 --- a/examples/widgets/mainwindows/mdi/main.cpp +++ b/examples/widgets/mainwindows/mdi/main.cpp @@ -9,8 +9,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(mdi); - QApplication app(argc, argv); QCoreApplication::setApplicationName("MDI Example"); QCoreApplication::setOrganizationName("QtProject"); diff --git a/examples/widgets/painting/affine/main.cpp b/examples/widgets/painting/affine/main.cpp index 3efd2125ac..1f9c2399c9 100644 --- a/examples/widgets/painting/affine/main.cpp +++ b/examples/widgets/painting/affine/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char **argv) { - Q_INIT_RESOURCE(affine); - QApplication app(argc, argv); XFormWidget xformWidget(nullptr); diff --git a/examples/widgets/painting/basicdrawing/main.cpp b/examples/widgets/painting/basicdrawing/main.cpp index 67a6d84562..1d8fd919b2 100644 --- a/examples/widgets/painting/basicdrawing/main.cpp +++ b/examples/widgets/painting/basicdrawing/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(basicdrawing); - QApplication app(argc, argv); Window window; window.show(); diff --git a/examples/widgets/painting/deform/main.cpp b/examples/widgets/painting/deform/main.cpp index b81adc09b4..5ac5b4cc3f 100644 --- a/examples/widgets/painting/deform/main.cpp +++ b/examples/widgets/painting/deform/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char **argv) { - Q_INIT_RESOURCE(deform); - QApplication app(argc, argv); bool smallScreen = QApplication::arguments().contains("-small-screen"); diff --git a/examples/widgets/painting/gradients/main.cpp b/examples/widgets/painting/gradients/main.cpp index f3b75a749c..c1e2297512 100644 --- a/examples/widgets/painting/gradients/main.cpp +++ b/examples/widgets/painting/gradients/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(gradients); - QApplication app(argc, argv); GradientWidget gradientWidget; diff --git a/examples/widgets/painting/imagecomposition/main.cpp b/examples/widgets/painting/imagecomposition/main.cpp index cd5468f088..a3cf65a344 100644 --- a/examples/widgets/painting/imagecomposition/main.cpp +++ b/examples/widgets/painting/imagecomposition/main.cpp @@ -8,8 +8,6 @@ //! [0] int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(imagecomposition); - QApplication app(argc, argv); ImageComposer composer; composer.show(); diff --git a/examples/widgets/painting/pathstroke/main.cpp b/examples/widgets/painting/pathstroke/main.cpp index a5ceb9e3c6..4f991e8a0a 100644 --- a/examples/widgets/painting/pathstroke/main.cpp +++ b/examples/widgets/painting/pathstroke/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char **argv) { - Q_INIT_RESOURCE(pathstroke); - QApplication app(argc, argv); bool smallScreen = QApplication::arguments().contains("-small-screen"); diff --git a/examples/widgets/richtext/textedit/main.cpp b/examples/widgets/richtext/textedit/main.cpp index 076d5df8ae..4d46dcd51c 100644 --- a/examples/widgets/richtext/textedit/main.cpp +++ b/examples/widgets/richtext/textedit/main.cpp @@ -10,8 +10,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(textedit); - QApplication a(argc, argv); QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setApplicationName("Rich Text"); diff --git a/examples/widgets/tools/completer/main.cpp b/examples/widgets/tools/completer/main.cpp index 4ea6bc1ac9..060dfe5bd8 100644 --- a/examples/widgets/tools/completer/main.cpp +++ b/examples/widgets/tools/completer/main.cpp @@ -7,8 +7,6 @@ //! [0] int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(completer); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/tools/customcompleter/main.cpp b/examples/widgets/tools/customcompleter/main.cpp index 13e8544b90..060dfe5bd8 100644 --- a/examples/widgets/tools/customcompleter/main.cpp +++ b/examples/widgets/tools/customcompleter/main.cpp @@ -7,8 +7,6 @@ //! [0] int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(customcompleter); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/tools/treemodelcompleter/main.cpp b/examples/widgets/tools/treemodelcompleter/main.cpp index 50ca573129..060dfe5bd8 100644 --- a/examples/widgets/tools/treemodelcompleter/main.cpp +++ b/examples/widgets/tools/treemodelcompleter/main.cpp @@ -7,8 +7,6 @@ //! [0] int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(treemodelcompleter); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/tools/undoframework/main.cpp b/examples/widgets/tools/undoframework/main.cpp index c43b2fccd7..8dfa3ffb4b 100644 --- a/examples/widgets/tools/undoframework/main.cpp +++ b/examples/widgets/tools/undoframework/main.cpp @@ -8,8 +8,6 @@ //! [0] int main(int argv, char *args[]) { - Q_INIT_RESOURCE(undoframework); - QApplication app(argv, args); MainWindow mainWindow; diff --git a/examples/widgets/widgets/styles/main.cpp b/examples/widgets/widgets/styles/main.cpp index 936e01e77f..5c33895ea4 100644 --- a/examples/widgets/widgets/styles/main.cpp +++ b/examples/widgets/widgets/styles/main.cpp @@ -8,8 +8,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(styles); - QApplication::setStyle(new NorwegianWoodStyle); QApplication app(argc, argv); diff --git a/examples/widgets/widgets/stylesheet/main.cpp b/examples/widgets/widgets/stylesheet/main.cpp index 9afdefc939..7d7cf3e573 100644 --- a/examples/widgets/widgets/stylesheet/main.cpp +++ b/examples/widgets/widgets/stylesheet/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(stylesheet); - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/widgets/widgets/tooltips/main.cpp b/examples/widgets/widgets/tooltips/main.cpp index 677d9ecd15..1cc7f435d5 100644 --- a/examples/widgets/widgets/tooltips/main.cpp +++ b/examples/widgets/widgets/tooltips/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(tooltips); - QApplication app(argc, argv); SortingBox sortingBox; sortingBox.show(); diff --git a/examples/widgets/widgets/validators/main.cpp b/examples/widgets/widgets/validators/main.cpp index b5a685e850..c09d428416 100644 --- a/examples/widgets/widgets/validators/main.cpp +++ b/examples/widgets/widgets/validators/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char **argv) { - Q_INIT_RESOURCE(validators); - QApplication app(argc, argv); ValidatorWidget w; diff --git a/tests/manual/examples/opengl/qopenglwidget/main.cpp b/tests/manual/examples/opengl/qopenglwidget/main.cpp index 04f1c57f08..1614649a5a 100644 --- a/tests/manual/examples/opengl/qopenglwidget/main.cpp +++ b/tests/manual/examples/opengl/qopenglwidget/main.cpp @@ -11,7 +11,6 @@ int main( int argc, char ** argv ) { - Q_INIT_RESOURCE(texture); QApplication a( argc, argv ); QCoreApplication::setApplicationName("Qt QOpenGLWidget Example"); diff --git a/tests/manual/examples/widgets/application/main.cpp b/tests/manual/examples/widgets/application/main.cpp index 903150c1c4..722b8a71b8 100644 --- a/tests/manual/examples/widgets/application/main.cpp +++ b/tests/manual/examples/widgets/application/main.cpp @@ -9,8 +9,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(application); - QApplication app(argc, argv); QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setApplicationName("Application Example"); diff --git a/tests/manual/examples/widgets/dialogs/classwizard/main.cpp b/tests/manual/examples/widgets/dialogs/classwizard/main.cpp index f31082b392..a58db7f54f 100644 --- a/tests/manual/examples/widgets/dialogs/classwizard/main.cpp +++ b/tests/manual/examples/widgets/dialogs/classwizard/main.cpp @@ -10,8 +10,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(classwizard); - QApplication app(argc, argv); #ifndef QT_NO_TRANSLATION |