fixes for MinGW, including adding CONFIG += c++11 in all qmake project files

2026-03-22 14:55:36 +08:00 · 2013-08-19 18:46:37 +01:00
parent 3567dace6f
commit 9b239f12aa
21 changed files with 22 additions and 19 deletions
--- a/samples/blackmiscquantities/sample_quantities_avionics.pro
+++ b/samples/blackmiscquantities/sample_quantities_avionics.pro
@@ -3,7 +3,7 @@ QT       += core dbus
 TARGET = sample_quantities_avionics
 TEMPLATE = app

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 DEPENDPATH += . ../../src/blackmisc
--- a/samples/blackmiscquantities_dbus/sample_quantities_avionics_dbus.pro
+++ b/samples/blackmiscquantities_dbus/sample_quantities_avionics_dbus.pro
@@ -3,7 +3,7 @@ QT       += core dbus
 TARGET = sample_quantities_avionics_dbus
 TEMPLATE = app

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 # Causes nmake to run qdbusxml2cpp to automatically generate the dbus adaptor and interface classes,
--- a/samples/blackmiscvectorgeo/sample_vector_geo.pro
+++ b/samples/blackmiscvectorgeo/sample_vector_geo.pro
@@ -1,7 +1,7 @@
 QT       += core dbus

 TARGET = sample_vector_geo
-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 TEMPLATE = app
--- a/samples/com_client/sample_com_client.pro
+++ b/samples/com_client/sample_com_client.pro
@@ -3,7 +3,7 @@ QT       -= gui

 TARGET = com_client

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 TEMPLATE = app
--- a/samples/com_server/sample_com_server.pro
+++ b/samples/com_server/sample_com_server.pro
@@ -4,7 +4,7 @@ QT       -= gui
 TARGET = com_server
 TEMPLATE = app

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 DEPENDPATH += . ../../src
--- a/samples/config/sample_config.pro
+++ b/samples/config/sample_config.pro
@@ -3,6 +3,7 @@ QT       -= gui

 TARGET = sample_config
 TEMPLATE = app
+CONFIG += c++11

 DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
--- a/samples/interpolator/sample_interpolator.pro
+++ b/samples/interpolator/sample_interpolator.pro
@@ -1,7 +1,7 @@
 QT       += core dbus

 TARGET = sample_interpolator
-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 TEMPLATE = app
--- a/samples/logging/sample_logging.pro
+++ b/samples/logging/sample_logging.pro
@@ -4,7 +4,7 @@ QT       -= gui
 TARGET = sample_logging
 TEMPLATE = app

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 DEPENDPATH += . ../../src
--- a/samples/plugin/sample_plugin.pro
+++ b/samples/plugin/sample_plugin.pro
@@ -3,7 +3,7 @@ QT       -= gui

 TARGET = sample_plugin
 TEMPLATE = lib
-CONFIG += plugin
+CONFIG += plugin c++11

 DEPENDPATH += . ../../src
 INCLUDEPATH += . ../../src
--- a/samples/pluginmgr/sample_pluginmgr.pro
+++ b/samples/pluginmgr/sample_pluginmgr.pro
@@ -4,7 +4,7 @@ QT       -= gui
 TARGET = sample_pluginmgr
 TEMPLATE = app

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 DEPENDPATH += . ../../src
--- a/src/blackbox/blackbox.pro
+++ b/src/blackbox/blackbox.pro
@@ -6,6 +6,7 @@ INCLUDEPATH += . ..

 TARGET = blackbox
 TEMPLATE = app
+CONFIG += c++11

 SOURCES += *.cpp
 HEADERS += *.h
--- a/src/blackcore/blackcore.pro
+++ b/src/blackcore/blackcore.pro
@@ -3,7 +3,7 @@ QT       += network dbus

 TARGET = blackcore
 TEMPLATE = lib
-CONFIG += staticlib
+CONFIG += staticlib c++11

 INCLUDEPATH += ..
 DEPENDPATH += . ..
--- a/src/blackd/blackd.pro
+++ b/src/blackd/blackd.pro
@@ -5,6 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

 TARGET = blackd
 TEMPLATE = app
+CONFIG += c++11

 DEPENDPATH += . ..
 INCLUDEPATH += ..
--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -2,7 +2,7 @@ QT       += network dbus

 TARGET = blackmisc
 TEMPLATE = lib
-CONFIG += staticlib
+CONFIG += staticlib c++11

 INCLUDEPATH += ..
 # DEPENDPATH += . .. // BlackMisc should be independent
--- a/src/blackmisc/pqunits.h
+++ b/src/blackmisc/pqunits.h
@@ -622,8 +622,8 @@ public:
     */
    static const CPressureUnit &mbar()
    {
-        static CPressureUnit bar(CMeasurementPrefix::m(), bar(), 1);
-        return bar;
+        static CPressureUnit mbar(CMeasurementPrefix::m(), bar(), 1);
+        return mbar;
    }

    /*!
--- a/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro
+++ b/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro
@@ -3,7 +3,7 @@ QT       += core dbus
 TARGET = blackmisc_cpp2xml
 TEMPLATE = lib

-CONFIG += plugin
+CONFIG += plugin c++11

 DEPENDPATH += . ../../src/blackmisc
 INCLUDEPATH += . ../../src
--- a/src/driver/fs9/driver_fs9.pro
+++ b/src/driver/fs9/driver_fs9.pro
@@ -1,6 +1,6 @@
 TARGET = bb_driver_fs9
 TEMPLATE = lib
-CONFIG += dll
+CONFIG += dll c++11

 INCLUDEPATH += .. ../../

--- a/src/driver/fsx/driver_fsx.pro
+++ b/src/driver/fsx/driver_fsx.pro
@@ -1,6 +1,6 @@
 TARGET = bb_driver_fsx
 TEMPLATE = lib
-CONFIG += dll
+CONFIG += dll c++11

 INCLUDEPATH += .. ../../

--- a/src/driver/xplane/driver_xplane.pro
+++ b/src/driver/xplane/driver_xplane.pro
@@ -1,6 +1,6 @@
 TARGET = bb_driver_xplane
 TEMPLATE = lib
-CONFIG += dll
+CONFIG += dll c++11

 INCLUDEPATH += .. ../../

--- a/tests/blackcore/test_blackcore.pro
+++ b/tests/blackcore/test_blackcore.pro
@@ -3,7 +3,7 @@ QT       += core testlib dbus
 TARGET = test_blackcore
 TEMPLATE = app

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 DEPENDPATH += . ../../src
--- a/tests/blackmisc/test_blackmisc.pro
+++ b/tests/blackmisc/test_blackmisc.pro
@@ -3,7 +3,7 @@ QT       += core testlib dbus
 TARGET = test_blackmisc
 TEMPLATE = app

-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle

 DEPENDPATH += . ../../src