Merge branch 'release/2.2.0'

.gitignore

@@ -0,0 +1 @@
+*.pro.user

.gitlab-ci.yml

@@ -0,0 +1,90 @@
+stages:
+  - build
+  - bundle
+
+.win_build_template: &win_build_definition
+  stage: build
+  script:
+    - if not exist "build" mkdir build
+    - if not exist "ide" mkdir ide
+    - cd build
+    - echo set -x; export PATH=`cygpath -u %QTDIR%/bin`:$PATH; qmake "CONFIG+=bundled" "DEFINES+=MINIZINC_IDE_BUILD=\\\\\\\"\"${CI_PIPELINE_ID}\\\\\\\"\"" ../MiniZincIDE/MiniZincIDE.pro; nmake; cp release/MiniZincIDE.exe ../ide; cd ../ide; windeployqt --no-translations --no-compiler-runtime --no-system-d3d-compiler MiniZincIDE.exe > build.sh
+    - d2u build.sh
+    - bash build.sh
+  artifacts:
+    paths:
+      - ide/
+
+
+build:linux:
+  stage: build
+  image: dekker1/qt:latest
+  script:
+    - mkdir -p build; cd build
+    - qmake -makefile "CONFIG+=bundled" "DEFINES+=MINIZINC_IDE_BUILD=\\\\\\\"\"${CI_PIPELINE_ID}\\\\\\\"\"" PREFIX=/usr ../MiniZincIDE/MiniZincIDE.pro
+    - make -j4
+    - make -j4 INSTALL_ROOT=../ide install; find ../ide/
+    - cd ..
+    - linuxdeployqt ide/usr/bin/MiniZincIDE -bundle-non-qt-libs -no-translations -no-copy-copyright-files
+  tags:
+    - linux
+    - docker
+  artifacts:
+    paths:
+      - ide/
+  cache:
+    key: "linux_$CI_COMMIT_REF_SLUG"
+    paths:
+      - build/
+
+build:osx:
+  stage: build
+  variables:
+    QTDIR: "$OSXQTDIR"
+  script:
+    - export PATH="$QTDIR/bin:$PATH"
+    - mkdir -p build; cd build
+    - qmake -makefile "CONFIG+=bundled" "DEFINES+=MINIZINC_IDE_BUILD=\\\\\\\"\"${CI_PIPELINE_ID}\\\\\\\"\"" ../MiniZincIDE/MiniZincIDE.pro
+    - make -j4
+    - cp -r MiniZincIDE.app ..
+  tags:
+    - osx
+    - cpp
+    - qt
+  artifacts:
+    paths:
+      - MiniZincIDE.app
+  cache:
+    key: "osx_$CI_COMMIT_REF_SLUG"
+    paths:
+      - build/
+
+.build:win32: #DISABLED
+  <<: *win_build_definition
+  variables:
+    QTDIR: "$WINQTDIR"
+  before_script:
+    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0/VC/vcvarsall.bat"
+  tags:
+    - win32
+    - cpp
+    - qt
+  cache:
+    key: "win32_$CI_COMMIT_REF_SLUG"
+    paths:
+      - build/
+
+build:win64:
+  <<: *win_build_definition
+  variables:
+    QTDIR: "$WINQTDIR"
+  before_script:
+    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0/VC/vcvarsall.bat" amd64
+  tags:
+    - win64
+    - cpp
+    - qt
+  cache:
+    key: "win64_$CI_COMMIT_REF_SLUG"
+    paths:
+      - build/

MiniZincIDE/MiniZincIDE.pro

@@ -19,7 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): {
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 2.1.7
+VERSION = 2.2.0
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {
@@ -49,27 +49,25 @@ SOURCES += main.cpp\
     codeeditor.cpp \
     highlighter.cpp \
     fzndoc.cpp \
-    aboutdialog.cpp \
     solverdialog.cpp \
     gotolinedialog.cpp \
-    help.cpp \
     finddialog.cpp \
     paramdialog.cpp \
     outputdockwidget.cpp \
     checkupdatedialog.cpp \
     project.cpp \
     htmlwindow.cpp \
     htmlpage.cpp \
-    moocsubmission.cpp
+    moocsubmission.cpp \
+    solverconfiguration.cpp \
+    esclineedit.cpp
 
 HEADERS  += mainwindow.h \
     codeeditor.h \
     highlighter.h \
     fzndoc.h \
-    aboutdialog.h \
     solverdialog.h \
     gotolinedialog.h \
-    help.h \
     finddialog.h \
     paramdialog.h \
     outputdockwidget.h \
@@ -78,14 +76,14 @@ HEADERS  += mainwindow.h \
     rtfexporter.h \
     htmlwindow.h \
     htmlpage.h \
-    moocsubmission.h
+    moocsubmission.h \
+    solverconfiguration.h \
+    esclineedit.h
 
 FORMS    += \
     mainwindow.ui \
-    aboutdialog.ui \
     solverdialog.ui \
     gotolinedialog.ui \
-    help.ui \
     finddialog.ui \
     paramdialog.ui \
     checkupdatedialog.ui \
@@ -95,5 +93,5 @@ FORMS    += \
 RESOURCES += \
     minizincide.qrc
 
-target.path = /bin
+target.path = $$PREFIX/bin
 INSTALLS += target