diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index f2cabda8..46a9638f 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(Doxygen) set_package_properties(Doxygen PROPERTIES TYPE OPTIONAL DESCRIPTION "API Documentation system" - URL "http://www.doxygen.org" + URL "https://www.doxygen.org" PURPOSE "Needed to build the API documentation." ) if(DOXYGEN_DOT_EXECUTABLE) diff --git a/src/private/multisplitter/Item.cpp b/src/private/multisplitter/Item.cpp index 4f49f01f..51384f42 100644 --- a/src/private/multisplitter/Item.cpp +++ b/src/private/multisplitter/Item.cpp @@ -164,7 +164,7 @@ QObject *Item::guestAsQObject() const } void Item::setGuestWidget(Widget *guest) -{ +{ Q_ASSERT(!guest || !m_guest); QObject *newWidget = guest ? guest->asQObject() : nullptr; QObject *oldWidget = guestAsQObject(); @@ -3202,8 +3202,8 @@ void ItemContainer::simplify() childContainer->simplify(); // recurse down the hierarchy if (childContainer->orientation() == d->m_orientation || childContainer->d->m_children.size() == 1) { - // This sub-container is reduntant, as it has the same orientation as its parent - // Canibalize it. + // This sub-container is redundant, as it has the same orientation as its parent + // Cannibalize it. for (Item *child2 : childContainer->childItems()) { child2->setParentContainer(this); newChildren.push_back(child2); diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index 80daece5..c52f925d 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -5289,7 +5289,7 @@ void TestDocks::tst_floatingAction() } { - // If the dock widget is alone then it's floating, but we we suddenly dock a widget side-by-side + // If the dock widget is alone then it's floating, but we suddenly dock a widget side-by-side // to it, then both aren't floating anymore. This test tests if the signal was emitted auto dock1 = createDockWidget("one", new QPushButton("one"));