Skip to content
Snippets Groups Projects

Qt4to5

Merged Antoine Regimbeau requested to merge qt4to5 into develop

We update dependencies from Qt4 to Qt5. There should be no major change in the API but here are the main modifications we made :

  • Module name is now OTBQT
  • Variables and macros (if home made) do not have any version number anymore
  • Variables such as QT_LMAKE_EXECUTABLE or QT_LMAKE_EXECUTABLE are not cached anymore
Edited by Antoine Regimbeau

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
22 22 #ifndef __itkQtProgressBar_h
23 23 #define __itkQtProgressBar_h
24 24
25 #include <QtGui>
25 #include <QtWidgets>
26 26 #ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
  • I'm not able to configure the branch with the default cmake settings. I've got the following CMake error:

    ======================= End of OTB cmake summary ======================= CMake Error at i18n/CMakeLists.txt:70 (qt5_add_translation): Unknown CMake command "qt5_add_translation".

    The reason is that there are 2 cmake option OTB_USE_QT4 and OTB_USE_QT5.

    Are we agree that we need only OTB_USE_QT option which will use Qt5?

  • added 1 commit

    • ed922b14 - SuperBuild: adding an external cmake for QT5

    Compare with previous version

  • added 1 commit

    • 0fbabdfd - SuperBuild: adding option to config command

    Compare with previous version

  • added 1 commit

    • b370c8c5 - SuperBuild: work on Qt5 build on windows

    Compare with previous version

  • added 1 commit

    • 0cd76d38 - SuperBuild: unknown option demos

    Compare with previous version

  • From my point of view, I agree that there should be only one OTB_USE_QT option (because we cannot switch between Qt4 and Qt5 but we can only enable/disable Qt support in OTB).

  • Yes, we are replacing qt4 by qt5 step by step. The branch cannot build with qt4. Maybe the default settings are still using QT4!

    Anyway, yes we can change the name to QT instead of QTVersionNum. But we are not there yet! :yum: This can be done when everything will be clean!

    Edited by Antoine Regimbeau
  • Maybe, you should set OTB_USE_QT4=OFF and OTB_USE_QT5=ON.

  • Guillaume Pasero added 3 commits

    added 3 commits

    • 48c3a5d4 - SuperBuild: fix broken list of configure options
    • e6ee9c27 - SuperBuild: by default use Qt5, not Qt4
    • 6b741d3a - SuperBuild: qwt uses Qt5

    Compare with previous version

  • added 1 commit

    • 14b544a4 - SuperBuild: fix configure list QT5

    Compare with previous version

  • added 1 commit

    • e4c28c81 - ENH: change qt4 to 5 in translation macro

    Compare with previous version

  • added 1 commit

    • f09c5e69 - BUG: add execution permission to .sh.in

    Compare with previous version

  • added 1 commit

    • 211c9613 - SuperBuild: get rid of no know command line arguments

    Compare with previous version

  • added 1 commit

    • 753057a6 - SuperBuild: change QT5 build directory

    Compare with previous version

  • added 1 commit

    • e59409e9 - SuperBuild: patch for jpeg detection on windows

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading