Merge branch 'develop' into 'master'

merge develop into master

See merge request Scientific-IT-Systems/gr!1166

.gitlab-ci.yml

@@ -900,16 +900,8 @@ windows-32bit-cross:
     CXX=i686-w64-mingw32-g++
     AR=i686-w64-mingw32-ar
     ARCHITECTURE=i686
-  - MAKE="make -f makefile.mingw" make -f makefile.mingw -C lib/grm/grplot
-    GRDIR=./
-    CC=i686-w64-mingw32-gcc
-    CXX=i686-w64-mingw32-g++
-    AR=i686-w64-mingw32-ar
-    ARCHITECTURE=i686
   - mkdir artifacts
   - cp lib/gks/qt/gksqt.exe artifacts/
-  - cp lib/grm/grplot/grplot.exe artifacts/
-  - cp lib/grm/grplot/README.md artifacts/grplot.man.md
   - cp lib/gks/qt/*.dll artifacts/
   - cp -r lib/gks/qt/platforms artifacts/
   - cp lib/gks/libGKS.lib lib/gks/libGKS.dll lib/gks/libGKS.a lib/gks/plugin/*.dll lib/gks/plugin/*.a lib/gr/libGR.lib
@@ -1148,7 +1140,7 @@ darwin-self-contained-iff1600:
   - curl -LO https://gr-framework.org/downloads/3rdparty/cmake-3.23.0-macos-universal.tar.gz
   - tar xf cmake-3.23.0-macos-universal.tar.gz
   - export CMAKE_CMD=`pwd`/cmake-3.23.0-macos-universal/CMake.app/Contents/bin/cmake
-  - export MACOSX_DEPLOYMENT_TARGET=10.14
+  - export MACOSX_DEPLOYMENT_TARGET=10.15
   - rm -rf /usr/local/gr/*
   - make self GRDIR=/usr/local/gr QMAKE=/usr/local/qt5/bin/qmake QT5_QMAKE=/usr/local/qt5/bin/qmake
   - mkdir artifacts
@@ -1199,7 +1191,7 @@ darwin-self-contained:
   tags:
   - libvirt
   script:
-  - export MACOSX_DEPLOYMENT_TARGET=10.14
+  - export MACOSX_DEPLOYMENT_TARGET=10.15
   - sudo mkdir /usr/local/gr
   - sudo chown administrator:wheel /usr/local/gr
   - make self GRDIR=/usr/local/gr QMAKE=/usr/local/qt5/bin/qmake QT5_QMAKE=/usr/local/qt5/bin/qmake QT6_QMAKE=/usr/local/qt6/bin/qmake
@@ -1319,12 +1311,9 @@ packages-tar:
   script:
   - mkdir -p Windows-i686/gr/bin
   - mkdir -p Windows-i686/gr/lib
-  - mkdir -p Windows-i686/gr/share/doc/grplot
   - mv artifacts-windows32/*.dll Windows-i686/gr/bin/
   - mv artifacts-windows32/*.lib Windows-i686/gr/bin/
   - mv artifacts-windows32/gksqt.exe Windows-i686/gr/bin/
-  - mv artifacts-windows32/grplot.exe Windows-i686/gr/bin/
-  - mv artifacts-windows32/grplot.man.md Windows-i686/gr/share/doc/grplot/
   - mv artifacts-windows32/platforms Windows-i686/gr/bin/
   - mv artifacts-windows32/fonts Windows-i686/gr/
   - mv artifacts-windows32/include Windows-i686/gr/

3rdparty/bzip2/Makefile

@@ -4,7 +4,7 @@ endif
 
   CFLAGS = -O -I. -fPIC -fno-common $(ARCHS)
 ifeq ($(shell uname),Darwin)
- CFLAGS += -mmacosx-version-min=10.14
+ CFLAGS += -mmacosx-version-min=10.15
 endif
     OBJS = blocksort.o \
         huffman.o \

3rdparty/cairo/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 1.16.0
 CAIRO_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-CAIRO_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+CAIRO_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/expat/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 2.4.8
 EXPAT_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-EXPAT_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+EXPAT_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/ffmpeg/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 4.2.1
 FFMPEG_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-FFMPEG_EXTRA_CONFIGURE_FLAGS += --extra-cflags=-mmacosx-version-min=10.14
+FFMPEG_EXTRA_CONFIGURE_FLAGS += --extra-cflags=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/freetype/Makefile

@@ -9,7 +9,7 @@ FTINCLUDES = -Isrc -Iinclude
   FTCFLAGS = -O -fPIC -fno-common $(FTINCLUDES) $(FTDEFINES) $(ARCHS)
 
 ifeq ($(shell uname -s),Darwin)
- FTCFLAGS += -mmacosx-version-min=10.14
+ FTCFLAGS += -mmacosx-version-min=10.15
 endif
 
       OBJS = \

3rdparty/glfw/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 3.3.3
 GLFW_EXTRA_CMAKE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
- GLFW_EXTRA_CMAKE_FLAGS += -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14
+ GLFW_EXTRA_CMAKE_FLAGS += -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/jpeg/Makefile

@@ -5,7 +5,7 @@ endif
   CFLAGS = -O -I. -fPIC -fno-common $(ARCHS)
 ifeq ($(shell uname),Darwin)
 ifneq ($(notdir $(CC)),emcc)
- CFLAGS += -mmacosx-version-min=10.14
+ CFLAGS += -mmacosx-version-min=10.15
 endif
 endif
     OBJS = \

3rdparty/libpng16/Makefile

@@ -5,7 +5,7 @@ endif
  PNGCFLAGS = -O -I. -I../zlib/ -fPIC -fno-common $(PNG_EXTRA_CFLAGS) $(ARCHS)
 ifeq ($(shell uname),Darwin)
 ifneq ($(notdir $(CC)),emcc)
-PNGCFLAGS += -mmacosx-version-min=10.14
+PNGCFLAGS += -mmacosx-version-min=10.15
 ifeq ($(shell arch),arm64)
 PNGCFLAGS += -DPNG_ARM_NEON_OPT=0
 endif

3rdparty/libxml2/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 2.10.4
 LIBXML2_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-LIBXML2_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+LIBXML2_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/makeself.sh

@@ -41,7 +41,7 @@ opts="${opts} USE_STATIC_CAIRO_LIBS=1 USE_STATIC_AGG_LIBS=1"
 
 extras=`pwd`/3rdparty/build
 extras_lib=${extras}/lib
-export PATH=${PATH}:${extras}/bin
+export PATH="${extras}/bin:${PATH}"
 
 ${MAKE} -C 3rdparty
 ${MAKE} -C 3rdparty extras

3rdparty/ogg/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 1.3.2
 OGG_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-OGG_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+OGG_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/openh264/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 2.0.0
 OPENH264_EXTRA_MAKE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-OPENH264_EXTRA_MAKE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+OPENH264_EXTRA_MAKE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/pixman/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 0.40.0
 PIXMAN_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-PIXMAN_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+PIXMAN_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/qhull/Makefile

@@ -5,7 +5,7 @@ endif
  CFLAGS = -O -fPIC -fno-common $(ARCHS)
 ifeq ($(shell uname),Darwin)
 ifneq ($(notdir $(CC)),emcc)
-CFLAGS += -mmacosx-version-min=10.14
+CFLAGS += -mmacosx-version-min=10.15
 endif
 endif
    LIBS = libqhull.a

3rdparty/theora/Makefile

@@ -6,7 +6,7 @@ VERSION = 1.1.1
 THEORA_CONFIGURE ?= ./configure
 THEORA_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-THEORA_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+THEORA_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/tiff/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 4.5.1
 TIFF_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
- TIFF_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.14
+ TIFF_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/vpx/Makefile

@@ -5,7 +5,7 @@ endif
 VERSION = 1.4.0
 VPX_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
-VPX_EXTRA_CONFIGURE_FLAGS += --extra-cflags=-mmacosx-version-min=10.14
+VPX_EXTRA_CONFIGURE_FLAGS += --extra-cflags=-mmacosx-version-min=10.15
 endif
 
 ifeq ($(DOWNLOAD_CMD),)

3rdparty/zeromq/Makefile

@@ -45,8 +45,8 @@ $(PREFIX)/src/zeromq-$(VERSION)/Makefile: $(PREFIX)/src/zeromq-$(VERSION)/config
 		$(ZEROMQ_EXTRA_CONFIGURE_FLAGS)
 
 $(PREFIX)/lib/libzmq.a: $(PREFIX)/src/zeromq-$(VERSION)/Makefile
-	MACOSX_DEPLOYMENT_TARGET="10.14" $(MAKE) -C $(PREFIX)/src/zeromq-$(VERSION) -j4
-	MACOSX_DEPLOYMENT_TARGET="10.14" $(MAKE) -C $(PREFIX)/src/zeromq-$(VERSION) install
+	MACOSX_DEPLOYMENT_TARGET="10.15" $(MAKE) -C $(PREFIX)/src/zeromq-$(VERSION) -j4
+	MACOSX_DEPLOYMENT_TARGET="10.15" $(MAKE) -C $(PREFIX)/src/zeromq-$(VERSION) install
 
 install: $(PREFIX)/lib/libzmq.a
 

3rdparty/zlib/Makefile

@@ -5,7 +5,7 @@ endif
 CFLAGS=-O -fPIC -DHAVE_HIDDEN $(ARCHS)
 ifeq ($(shell uname),Darwin)
 ifneq ($(notdir $(CC)),emcc)
-CFLAGS += -mmacosx-version-min=10.14
+CFLAGS += -mmacosx-version-min=10.15
 endif
 endif
 LIBS=libz.a

CMakeLists.txt

@@ -942,8 +942,8 @@ if(Qt4_FOUND)
   add_library(qt4gr SHARED lib/gr/qtgr/grwidget.cxx)
   target_link_libraries(qt4gr PUBLIC GR::GR)
   target_link_libraries(qt4gr PUBLIC Qt4::QtCore Qt4::QtGui)
-  if(MINGW)
-    target_compile_options(qt4gr PRIVATE -fno-exceptions ${COMPILER_OPTION_ERROR_IMPLICIT})
+  if(MINGW AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
+    target_compile_options(qt4gr PRIVATE -fno-exceptions)
   endif()
   target_compile_options(qt4gr PRIVATE ${COMPILER_OPTION_ERROR_IMPLICIT})
   set_target_properties(qt4gr PROPERTIES SUFFIX "${GR_SHARED_LIBRARY_SUFFIX}" INSTALL_RPATH "${INSTALL_RPATH}")
@@ -967,8 +967,8 @@ if(Qt5Widgets_FOUND AND Qt5Core_FOUND)
   add_library(qt5gr SHARED lib/gr/qtgr/grwidget.cxx)
   target_link_libraries(qt5gr PUBLIC GR::GR)
   target_link_libraries(qt5gr PUBLIC Qt5::Core Qt5::Widgets)
-  if(MINGW)
-    target_compile_options(qt5gr PRIVATE -fno-exceptions ${COMPILER_OPTION_ERROR_IMPLICIT})
+  if(MINGW AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
+    target_compile_options(qt5gr PRIVATE -fno-exceptions)
   endif()
   target_compile_options(qt5gr PRIVATE ${COMPILER_OPTION_ERROR_IMPLICIT})
   set_target_properties(qt5gr PROPERTIES SUFFIX "${GR_SHARED_LIBRARY_SUFFIX}" INSTALL_RPATH "${INSTALL_RPATH}")
@@ -992,8 +992,8 @@ if(Qt6Widgets_FOUND AND Qt6Core_FOUND)
   add_library(qt6gr SHARED lib/gr/qtgr/grwidget.cxx)
   target_link_libraries(qt6gr PUBLIC GR::GR)
   target_link_libraries(qt6gr PUBLIC Qt6::Core Qt6::Widgets)
-  if(MINGW)
-    target_compile_options(qt6gr PRIVATE -fno-exceptions ${COMPILER_OPTION_ERROR_IMPLICIT})
+  if(MINGW AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
+    target_compile_options(qt6gr PRIVATE -fno-exceptions)
   endif()
   target_compile_options(qt6gr PRIVATE ${COMPILER_OPTION_ERROR_IMPLICIT})
   set_target_properties(qt6gr PROPERTIES SUFFIX "${GR_SHARED_LIBRARY_SUFFIX}" INSTALL_RPATH "${INSTALL_RPATH}")
@@ -1096,8 +1096,8 @@ if(Qt4_FOUND
   set_target_properties(
     gksqt PROPERTIES CXX_STANDARD 11 CXX_EXTENSIONS OFF CXX_STANDARD_REQUIRED ON INSTALL_RPATH "${gksqt_INSTALL_RPATH}"
   )
-  if(MINGW)
-    target_compile_options(gksqt PRIVATE -fno-exceptions ${COMPILER_OPTION_ERROR_IMPLICIT})
+  if(MINGW AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
+    target_compile_options(gksqt PRIVATE -fno-exceptions)
   endif()
   target_compile_options(gksqt PRIVATE ${COMPILER_OPTION_ERROR_IMPLICIT})
   if(GR_MANUAL_MOC_AND_RCC)
@@ -1163,17 +1163,20 @@ else()
   string(APPEND GR_REPORT "- gksqt: No (Qt4 / Qt5 / Qt6 not found)\n")
 endif()
 
-if((Qt6Widgets_FOUND
-    AND Qt6Core_FOUND
-    AND Qt6Gui_FOUND
+if(((Qt6Widgets_FOUND
+     AND Qt6Core_FOUND
+     AND Qt6Gui_FOUND
+    )
+    OR (Qt5Widgets_FOUND
+        AND Qt5Core_FOUND
+        AND Qt5Gui_FOUND
+       )
    )
-   OR (Qt5Widgets_FOUND
-       AND Qt5Core_FOUND
-       AND Qt5Gui_FOUND
-      )
+   AND (NOT MINGW OR NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
 )
   add_executable(
     grplot WIN32 MACOSX_BUNDLE
+    lib/grm/grplot/gredit/AddElementWidget.cpp
     lib/grm/grplot/gredit/Bounding_logic.cpp
     lib/grm/grplot/gredit/Bounding_object.cpp
     lib/grm/grplot/gredit/CustomTreeWidgetItem.cpp
@@ -1193,6 +1196,9 @@ if((Qt6Widgets_FOUND
     set(grplot_INSTALL_RPATH "${INSTALL_RPATH};${Qt5_LIBRARY_DIR}")
   endif()
   target_compile_definitions(grplot PRIVATE GRDIR="${GR_DIRECTORY}")
+  if(NOT TARGET LibXml2::LibXml2)
+    target_compile_definitions(grplot PRIVATE NO_LIBXML2)
+  endif()
   set_target_properties(
     grplot PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF CXX_STANDARD_REQUIRED ON INSTALL_RPATH
                                                                                   "${grplot_INSTALL_RPATH}"
@@ -1275,6 +1281,14 @@ if((Qt6Widgets_FOUND
         ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/TreeWidget.h -o ${CMAKE_CURRENT_BINARY_DIR}/moc_TreeWidget.cpp
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/TreeWidget.h
     )
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_AddElementWidget.cpp
+      COMMAND
+        ${QT_MOC_EXECUTABLE} -DGRDIR=\"$(GR_DIRECTORY)\" ${MOC_INCLUDE_FLAGS}
+        ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/AddElementWidget.h -o
+        ${CMAKE_CURRENT_BINARY_DIR}/moc_AddElementWidget.cpp
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/AddElementWidget.h
+    )
     target_sources(
       grplot
       PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/moc_grplot_mainwindow.cxx
@@ -1283,6 +1297,7 @@ if((Qt6Widgets_FOUND
               ${CMAKE_CURRENT_BINARY_DIR}/moc_Bounding_object.cpp
               ${CMAKE_CURRENT_BINARY_DIR}/moc_CustomTreeWidgetItem.cpp
               ${CMAKE_CURRENT_BINARY_DIR}/moc_TreeWidget.cpp
+              ${CMAKE_CURRENT_BINARY_DIR}/moc_AddElementWidget.cpp
               ${CMAKE_CURRENT_BINARY_DIR}/moc_grm_args_t_wrapper.cpp
               ${CMAKE_CURRENT_BINARY_DIR}/moc_receiver_thread.cpp
     )
@@ -1296,6 +1311,7 @@ if((Qt6Widgets_FOUND
               ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/Bounding_object.h
               ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/CustomTreeWidgetItem.h
               ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/TreeWidget.h
+              ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/gredit/AddElementWidget.h
               ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/qtterm/grm_args_t_wrapper.h
               ${CMAKE_CURRENT_SOURCE_DIR}/lib/grm/grplot/qtterm/receiver_thread.h
     )
@@ -1306,9 +1322,7 @@ if((Qt6Widgets_FOUND
   if(WIN32)
     target_compile_definitions(grplot PRIVATE GR_STATIC_LIB)
   endif()
-  if(MINGW)
-    target_compile_options(grplot PRIVATE -fno-exceptions ${COMPILER_OPTION_ERROR_IMPLICIT})
-  endif()
+  target_compile_options(grplot PRIVATE ${COMPILER_OPTION_ERROR_IMPLICIT})
   string(APPEND GR_REPORT "- grplot: Yes\n")
 else()
   string(APPEND GR_REPORT "- grplot: No (Qt6 and Qt5 not found)\n")

cmake/FindZLIB.cmake

@@ -35,7 +35,9 @@ endif()
 if(ZLIB_INCLUDE_DIR)
   if(NOT ZLIB_VERSION_STRING)
     file(READ ${ZLIB_INCLUDE_DIR}/zlib.h ZLIB_H_TEXT)
-    string(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+.[0-9]+.[0-9]+)\".*" "\\1" ZLIB_VERSION_STRING ${ZLIB_H_TEXT})
+    string(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+.[0-9]+(.[0-9]+)?)\".*" "\\1" ZLIB_VERSION_STRING
+                         ${ZLIB_H_TEXT}
+    )
   endif()
 endif()
 

cmake/i686-w64-mingw32.cmake

@@ -1,4 +1,5 @@
 set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR i686)
 add_definitions(-D_WIN32_WINNT=0x0600)
 set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
 set(CMAKE_C_COMPILER_TARGET i686-w64-mingw32)

cmake/x86_64-w64-mingw32.cmake

@@ -1,4 +1,5 @@
 set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
 add_definitions(-D_WIN32_WINNT=0x0600)
 set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
 set(CMAKE_C_COMPILER_TARGET x86_64-w64-mingw32)

lib/Preflight

@@ -141,9 +141,20 @@ else
 fi
 printf "%12s: %s\n" "dvipng" "$info" >&2
 
+function version {
+  echo "$@" | awk -F. '{ printf("%d\n", $1); }';
+}
+
 if [ "$qt" != "no" ]
 then
-  for qt_major_version in 4 5 6
+  qt_versions="4 5 6"
+  if [ `uname` == "Darwin" ]; then
+    if [ $(version "`sw_vers --productVersion`") -ge "14" ]; then
+      qt_versions="5 6"
+      qt4defs="QT4DEFS=-DNO_QT4 QT4_QMAKE=false"
+    fi
+  fi
+  for qt_major_version in ${qt_versions}
   do
     eval current_qt="$qt${qt_major_version}"
     if [ "${current_qt}" != "no" ]