TetraIF migration and Unittest Implementation for it
Entire-Checkpoint: 14d1fef0cf36
This commit is contained in:
1 parent
a86f9b5bac
commit
ba212f9dce
78 files changed
+1611
-640
No files matched your search
@@ -1,5 +1,6 @@
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtGui/QWindow>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QNetworkProxy>
|
||||
#ifndef WIN32
|
||||
@@ -39,8 +40,8 @@ int main(int argc, char *argv[])
|
||||
QNetworkProxy::setApplicationProxy(QNetworkProxy());
|
||||
app.createLogger("LogView", logConfigFileName.c_str());
|
||||
|
||||
QCoreApplication::setOrganizationName(QLatin1String("RME"));
|
||||
QCoreApplication::setApplicationName(QLatin1String("LogView"));
|
||||
QCoreApplication::setOrganizationName(QStringLiteral("RME"));
|
||||
QCoreApplication::setApplicationName(QStringLiteral("LogView"));
|
||||
|
||||
QSettings settings;
|
||||
settings.beginGroup(N_LogView::LogViewGui::WINDOW_GROUP);
|
||||
@@ -48,7 +49,12 @@ int main(int argc, char *argv[])
|
||||
settings.endGroup();
|
||||
|
||||
QScreen *screen = QGuiApplication::screens().value(screenNbr, QGuiApplication::primaryScreen());
|
||||
N_LogView::LogViewGui* logViewGui = new N_LogView::LogViewGui(screen);
|
||||
N_LogView::LogViewGui* logViewGui = new N_LogView::LogViewGui(nullptr);
|
||||
// A QScreen is not a QWidget in Qt6, so the target screen can no longer be passed as the
|
||||
// parent widget. Create the native window first, then assign it to the requested screen.
|
||||
logViewGui->winId();
|
||||
if (screen && logViewGui->windowHandle())
|
||||
logViewGui->windowHandle()->setScreen(screen);
|
||||
logViewGui->show();
|
||||
int ret = app.exec();
|
||||
|
||||
|
||||
Reference in new issue
Block a user