Fix deprecated Qt::operator+ warnings and QDESIGNER_WIDGET_EXPORT redefinition

- Replace deprecated Qt::CTRL + Qt::Key_X with Qt::CTRL | Qt::Key_X in examples
- Add guard to prevent QDESIGNER_WIDGET_EXPORT macro redefinition in Qt6

Author: koppi

designer/QGCodeEditorPlugin.cpp

@@ -25,7 +25,9 @@
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     #include <QtUiPlugin/QDesignerCustomWidgetInterface>
     #include <QtUiPlugin/QDesignerExportWidget>
-    #define QDESIGNER_WIDGET_EXPORT QGCODEEDITOR_EXPORT
+    #if !defined(QDESIGNER_WIDGET_EXPORT)
+        #define QDESIGNER_WIDGET_EXPORT QGCODEEDITOR_EXPORT
+    #endif
 #elif QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     #include <QtUiPlugin/QDesignerExportWidget>
 #else

examples/contextMenu/mainwindow.cpp

@@ -28,15 +28,15 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->setupUi(this);
 
     QList<QKeySequence> s; // exit app with ESC or CTRL+Q
-    s << QKeySequence(Qt::Key_Escape) << QKeySequence(Qt::CTRL + Qt::Key_Q);
+    s << QKeySequence(Qt::Key_Escape) << QKeySequence(Qt::CTRL | Qt::Key_Q);
     ui->action_Quit->setShortcuts(s);
 
     connect(ui->gcode, SIGNAL(runFromSelected(int)), this, SLOT(onRunFromSelected(int)));
 
     // add a non-menubar keyboard shortcut to QMainWindow
     QAction* a = new QAction(this);
     QList<QKeySequence> sr; // run from selected line with F1 or CTRL+R
-    sr << QKeySequence(Qt::Key_F1) << QKeySequence(Qt::CTRL + Qt::Key_R);
+    sr << QKeySequence(Qt::Key_F1) << QKeySequence(Qt::CTRL | Qt::Key_R);
     a->setShortcuts(sr);
     connect(a, SIGNAL(triggered()), ui->gcode, SLOT(onRunFrom()));
     this->addAction(a);

examples/contextMenu/mygcodeeditor.cpp

@@ -33,7 +33,7 @@ MyGCodeEditor::MyGCodeEditor(QWidget *parent) : QGCodeEditor(parent)
     actionRunFrom = new QAction(this);
     actionRunFrom->setObjectName(QString::fromUtf8("actionRunFrom"));
     actionRunFrom->setText(tr("Run"));
-    actionRunFrom->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+    actionRunFrom->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R));
 }
 
 void MyGCodeEditor::contextMenuEvent(QContextMenuEvent *event)

examples/pipe/mainwindow.cpp

@@ -31,7 +31,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->setupUi(this);
 
     QList<QKeySequence> s; // exit app with ESC or CTRL+Q
-    s << QKeySequence(Qt::Key_Escape) << QKeySequence(Qt::CTRL + Qt::Key_Q);
+    s << QKeySequence(Qt::Key_Escape) << QKeySequence(Qt::CTRL | Qt::Key_Q);
     ui->action_Quit->setShortcuts(s);
 
     // disable line buffering on stdin