philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Remove the last usage of asQWidget() from tests/

Browse Source 
Now only a few remaining in src/
This commit is contained in:
Sergio Martins
2022-04-19 19:26:34 +01:00
parent 23b2ea7195
commit 33073c75ee
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/qtwidgets/tst_qtwidgets.cpp
View File

@@ -9,6 +9,11 @@
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
/// @file
/// @brief Here lives the tests that only apply to QtWidgets
/// either because they haven't been ported to QtQuick yet or because they are really
/// QtWidgets specific.
#include "Platform.h"
#include "KDDockWidgets.h"
#include "../utils.h"
@@ -39,9 +44,24 @@ using namespace KDDockWidgets::Controllers;
using namespace KDDockWidgets::Tests;
using namespace Layouting;
/// @brief Here lives the tests that only apply to QtWidgets
/// either because they haven't been ported to QtQuick yet or because they are really
/// QtWidgets specific.
inline EmbeddedWindow *createEmbeddedMainWindow(QSize sz)
{
static int count = 0;
count++;
// Tests a MainWindow which isn't a top-level window, but is embedded in another window
auto mainwindow = createMainWindow(QSize(600, 600), MainWindowOption_HasCentralFrame).release();
auto window = new EmbeddedWindow(mainwindow);
auto lay = new QVBoxLayout(window);
lay->setContentsMargins(100, 100, 100, 100);
lay->addWidget(qobject_cast<QWidget *>(mainwindow->view()->asQObject()));
window->show();
window->resize(sz);
return window;
}
class TestQtWidgets : public QObject
{
Q_OBJECT

21
tests/utils.h
View File

@@ -437,27 +437,6 @@ inline void dragFloatingWindowTo(Controllers::FloatingWindow *fw, DropArea *targ
drag(draggable, QPoint(), dropPoint, ButtonAction_Release);
}
inline EmbeddedWindow *createEmbeddedMainWindow(QSize sz)
{
static int count = 0;
count++;
// Tests a MainWindow which isn't a top-level window, but is embedded in another window
auto mainwindow = createMainWindow(QSize(600, 600), MainWindowOption_HasCentralFrame).release();
auto window = new EmbeddedWindow(mainwindow);
#ifdef KDDOCKWIDGETS_QTWIDGETS
auto lay = new QVBoxLayout(window);
lay->setContentsMargins(100, 100, 100, 100);
lay->addWidget(mainwindow->view()->asQWidget());
#else
// TODO: For QtQuick we need some QML
qWarning() << "Parent me!";
#endif
window->show();
window->resize(sz);
return window;
}
}
inline bool qpaPassedAsArgument(int argc, char *argv[])