Commit 86249207 authored by Antoine Regimbeau's avatar Antoine Regimbeau

COMP: creating a new Qt5 module still no compilation

parent cd31526a
......@@ -22,6 +22,6 @@ set( DOCUMENTATION "Adapters for the Qt Library.")
otb_module( OTBQtAdapters
ENABLE_SHARED
DEPENDS OTBQt4
DEPENDS OTBQt5
DESCRIPTION "${DOCUMENTATION}"
)
......@@ -34,7 +34,7 @@ qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} )
add_library( OTBQtAdapters ${OTBQtAdapters_SRC} ${OTBQtAdapters_SRC_MOC})
target_link_libraries( OTBQtAdapters
${OTBQt4_LIBRARIES}
${OTBQt5_LIBRARIES}
)
otb_module_target( OTBQtAdapters )
......@@ -18,13 +18,7 @@
# limitations under the License.
#
#find_package( Qt4 REQUIRED QtCore QtGui QtOpenGL) # QtXml )
find_package(Qt5Core)
find_package(Qt5Widgets)
#FIXME move to i18n directory?
find_package(Qt5LinguistTools)
find_package( Qt4 REQUIRED QtCore QtGui QtOpenGL) # QtXml )
mark_as_advanced( QT_QMAKE_EXECUTABLE )
#set( QT_USE_QTXML 1 )
#include( ${QT_USE_FILE} )
include( ${QT_USE_FILE} )
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
project( OTBQt5 )
set( OTBQt5_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} )
set( QT_VERSION "${QTVERSION}" CACHE INTERNAL "" FORCE )
otb_module_impl()
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
find_package(Qt5Core)
find_package(Qt5Gui)
find_package(Qt5Widgets)
find_package(Qt5LinguistTools)
mark_as_advanced( QT_QMAKE_EXECUTABLE )
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
set(DOCUMENTATION "This module imports Qt5 to the build system")
otb_module(OTBQt5
DEPENDS
TEST_DEPENDS
DESCRIPTION
"${DOCUMENTATION}"
)
otb_module_activation_option("Enable Qt5 dependent modules" OFF)
......@@ -27,7 +27,7 @@ otb_module( OTBMapla
DEPENDS
OTBMonteverdiCore
OTBMonteverdiGUI
OTBQt4
OTBQt5
OPTIONAL_DEPENDS
......
......@@ -79,7 +79,7 @@ add_library( OTBMapla
target_link_libraries( OTBMapla
${OTBMonteverdiCore_LIBRARIES}
${OTBMonteverdiGUI_LIBRARIES}
${OTBQt4_LIBRARIES}
${OTBQt5_LIBRARIES}
)
otb_module_target( OTBMapla )
......
......@@ -29,7 +29,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -27,7 +27,7 @@ otb_module( OTBMonteverdi
DEPENDS
OTBMonteverdiCore
OTBMonteverdiGUI
OTBQt4
OTBQt5
OTBQtAdapters
OPTIONAL_DEPENDS
......
......@@ -62,7 +62,7 @@ add_library( OTBMonteverdi
target_link_libraries( OTBMonteverdi
${OTBMonteverdiCore_LIBRARIES}
${OTBMonteverdiGUI_LIBRARIES}
${OTBQt4_LIBRARIES}
${OTBQt5_LIBRARIES}
${OTBQtAdapters_LIBRARIES}
)
otb_module_target( OTBMonteverdi )
......
......@@ -29,7 +29,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -37,7 +37,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -36,7 +36,7 @@ otb_module( OTBMonteverdiCore
OTBObjectList
OTBOSSIMAdapters
OTBProjection
OTBQt4
OTBQt5
OTBStatistics
OTBTransform
......
......@@ -111,7 +111,7 @@ target_link_libraries( OTBMonteverdiCore
${OTBObjectList_LIBRARIES}
${OTBOSSIMAdapters_LIBRARIES}
${OTBProjection_LIBRARIES}
${OTBQt4_LIBRARIES}
${OTBQt5_LIBRARIES}
${OTBStatistics_LIBRARIES}
${OTBTransform_LIBRARIES}
)
......
......@@ -29,7 +29,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -34,7 +34,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -35,7 +35,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -29,7 +29,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// Qwt includes.
......
......@@ -34,7 +34,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -29,7 +29,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -35,7 +35,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
#include <qnamespace.h>
//
......
......@@ -35,7 +35,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -34,7 +34,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
#include <QShortcut>
//
......
......@@ -34,7 +34,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -33,7 +33,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -29,7 +29,7 @@ otb_module( OTBMonteverdiGUI
OTBIce
OTBIOGDAL
OTBMonteverdiCore
OTBQt4
OTBQt5
OTBQwt
OPTIONAL_DEPENDS
......
......@@ -24,7 +24,7 @@
//
// Qt includes (sorted by alphabetic order)
//// Must be included before system/custom includes.
#include <QtGui>
#include <QtWidgets>
//
// System includes (sorted by alphabetic order)
......
......@@ -22,7 +22,7 @@
#ifndef __itkQtProgressBar_h
#define __itkQtProgressBar_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkCommand.h"
#endif //tag=QT4-boost-compatibility
......
......@@ -22,7 +22,7 @@
#ifndef otbQtApplication_h
#define otbQtApplication_h
#include <QtGui>
#include <QtWidgets>
#include <QString>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkMacro.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbQtFileSelectionWidget_h
#define otbQtFileSelectionWidget_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputImageListParameter.h"
#include "otbWrapperInputFilenameListParameter.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbQtLogOutput_h
#define otbQtLogOutput_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "itkStdStreamLogOutput.h"
#endif //tag=QT4-boost-compatibility
......
......@@ -21,7 +21,7 @@
#ifndef otbQtStringSelectionWidget_h
#define otbQtStringSelectionWidget_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperStringListParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetChoiceParameter_h
#define otbWrapperQtWidgetChoiceParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperChoiceParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetComplexInputImageParameter_h
#define otbWrapperQtWidgetComplexInputImageParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperComplexInputImageParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetComplexOutputImageParameter_h
#define otbWrapperQtWidgetComplexOutputImageParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperComplexOutputImageParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetDirectoryParameter_h
#define otbWrapperQtWidgetDirectoryParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperDirectoryParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetEmptyParameter_h
#define otbWrapperQtWidgetEmptyParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperEmptyParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetFloatParameter_h
#define otbWrapperQtWidgetFloatParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperNumericalParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetInputFilenameListParameter_h
#define otbWrapperQtWidgetInputFilenameListParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
# include "otbWrapperQtWidgetParameterList.h"
......
......@@ -21,7 +21,7 @@
#ifndef otbWrapperQtWidgetInputFilenameParameter_h
#define otbWrapperQtWidgetInputFilenameParameter_h
#include <QtGui>
#include <QtWidgets>
#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 //tag=QT4-boost-compatibility
#include "otbWrapperInputFilenameParameter.h"
#include "otbWrapperQtWidgetParameterBase.h"
......