fix qt5 support for MinGW #31

.github/workflows/ci.yml

@@ -96,8 +96,8 @@ jobs:
           python -m pip install --upgrade aqtinstall
           # there is no win64_msvc2019_64 for Qt 5.12.12
           aqt install-qt --outputdir C:\Qt windows desktop 5.15.2 win64_msvc2019_64
+          aqt install-qt --outputdir C:\Qt windows desktop 5.15.2 win64_mingw81
           # aqt install-qt --outputdir C:\Qt windows desktop 5.12.12 win64_msvc2017_64
-          # aqt install-qt --outputdir C:\Qt windows desktop 5.15.2 win64_mingw81
         fi
       shell: bash
 

demos/README.rst

@@ -48,4 +48,4 @@ MS Windows:
     - pyyaml (optional)
     - msvc (Microsoft Visual C++)
     - boost
-    - qt5 (in C:\Qt)
+    - qt5 (msvc and mingw versions in C:\Qt)

demos/qt5/03-simple-nomsvc/appwindow.cpp

@@ -0,0 +1,40 @@
+#include <QToolBar>
+#include <QIcon>
+#include <QAction>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QTextEdit>
+#include <QApplication>
+
+#include "appwindow.h"
+
+AppWindow::AppWindow()
+{
+    auto* newAct = new QAction(tr("&New"), this);
+    auto* openAct = new QAction(tr("&Open"), this);
+    auto* quitAct = new QAction(tr("&Quit"), this);
+    quitAct->setShortcuts(QKeySequence::Quit);
+    quitAct->setStatusTip(tr("Exit the application"));
+
+    connect(quitAct, &QAction::triggered, qApp, &QApplication::quit);
+
+    auto* menu = menuBar()->addMenu(tr("&File"));
+    menu->addAction(newAct);
+    menu->addAction(openAct);
+    menu->addAction(quitAct);
+
+    auto* toolbar = addToolBar(tr("Main toolbar"));
+    toolbar->addAction(newAct);
+    toolbar->addAction(openAct);
+    toolbar->addSeparator();
+    toolbar->addAction(quitAct);
+
+    auto* edit = new QTextEdit(this);
+    edit->setText("Hello, world!");
+    edit->append(QString("Qt version: ") + qVersion());
+
+    setCentralWidget(edit);
+
+    statusBar()->showMessage(tr("Ready"));
+}

demos/qt5/03-simple-nomsvc/appwindow.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <QMainWindow>
+
+class AppWindow : public QMainWindow
+{
+public:
+    AppWindow();
+};

demos/qt5/03-simple-nomsvc/buildconf.yml

@@ -0,0 +1,20 @@
+
+tasks:
+  main:
+    features : cxxprogram qt5
+    source   : appwindow.cpp main.cpp
+    use      : QtWidgets
+
+GCC_BASE_FLAGS: -std=c++11 -fPIC
+
+buildtypes:
+  debug:
+    cxxflags: $GCC_BASE_FLAGS -O0 -g
+    toolchain: g++ # force use of gcc
+
+  release:
+    cxxflags: $GCC_BASE_FLAGS -O2
+    toolchain: g++ # force use of gcc
+
+  default: debug
+

demos/qt5/03-simple-nomsvc/main.cpp

@@ -0,0 +1,17 @@
+
+#include <QApplication>
+
+#include "appwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    AppWindow window;
+
+    window.resize(500, 300);
+    window.setWindowTitle("Simple example");
+    window.show();
+
+    return app.exec();
+}

src/zenmake/zm/features/qt5.py

@@ -391,11 +391,20 @@ def _findSingleQt5LibAsIs(conf, qtlibname, qtlibDeps, forceStatic):
     qtLibDir = env.QTLIBS
     uselib   = qtlibname.upper()
 
+    isMSVC = conf.env.CXX_NAME == 'msvc'
+
     if forceStatic:
         exts   = ('.a', '.lib')
         envPrefix = 'STLIB'
     else:
-        exts   = ('.so', '.lib')
+        if isMSVC:
+            exts = ('.lib', )
+        elif env.DEST_OS == 'win32':
+            # MinGW g++/clang++
+            # .a files from mingw version of Qt5 are not static libs
+            exts = ('.a', )
+        else:
+            exts = ('.so', '.lib')
         envPrefix = 'LIB'
 
     def libPrefixExt():
@@ -413,7 +422,8 @@ def setUpLib(prefix, module, ext):
         if not _pathexists(_joinpath(qtLibDir, libFileName)):
             return False
 
-        libval = prefix + basename if env.DEST_OS == 'win32' else basename
+        #libval = prefix + basename if env.DEST_OS == 'win32' else basename
+        libval = basename
         env.append_unique('%s_%s' % (envPrefix, uselib), libval)
         addModuleDefine(module)
         return True

tests/func_base_test.py

@@ -32,6 +32,7 @@
 RE_ALL_GTK3  = '^gtk3/'
 RE_ALL_SDL2  = '^sdl2/'
 RE_ALL_QT5   = '^qt5/'
+RE_QT5_WINONLY = '^qt5/03-simple-nomsvc'
 RE_EXT_DEPS  = '^external-deps/'
 
 TEST_CONDITIONS = {
@@ -48,6 +49,7 @@
         dict(regexp = RE_ALL_DBUS, condition = dict( os = ['linux'], )),
         dict(regexp = RE_ALL_GTK3, condition = dict( os = ['linux'], )),
         dict(regexp = RE_ALL_SDL2, condition = dict( os = ['linux'], )),
+        dict(regexp = RE_QT5_WINONLY, condition = dict( os = ['windows'], )),
         dict(regexp = RE_ALL_QT5, condition = dict( os = ['linux', 'windows'], )),
         dict(regexp = RE_EXT_DEPS + '1-makefile',
             condition = dict( os = ['linux', 'darwin'], )),