Qt5 build fixes (plugins/core)

--HG-- branch : qt5
10 years ago · f79b66ca82
parent 885a7570f2
commit f79b66ca82
27 changed files with 104 additions and 82 deletions
--- a/code/studio/src/CMakeLists.txt
+++ b/code/studio/src/CMakeLists.txt
@ -81,6 +81,6 @@ NL_DEFAULT_PROPS(studio "Tools: Studio")
 NL_ADD_RUNTIME_FLAGS(studio)

 ADD_SUBDIRECTORY(3rdparty)
-#ADD_SUBDIRECTORY(plugins)
+ADD_SUBDIRECTORY(plugins)

 INSTALL(TARGETS studio RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT runtime BUNDLE DESTINATION /Applications)
--- a/code/studio/src/extension_system/iplugin.h
+++ b/code/studio/src/extension_system/iplugin.h
@ -19,9 +19,9 @@
 #ifndef IPLUGIN_H
 #define IPLUGIN_H

-#include <QtCore/QtPlugin>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QtPlugin>
+#include <QString>
+#include <QStringList>

 #include "iplugin_manager.h"

@ -99,6 +99,7 @@ public:

 }; //namespace ExtensionSystem

-Q_DECLARE_INTERFACE(ExtensionSystem::IPlugin, "dev.ryzom.com.ObjectViewerQt.IPlugin/0.9.2")
+#define NL_STUDIO_IPLUGIN_IID "org.ryzomcore.Studio.IPlugin/0.10.0"
+Q_DECLARE_INTERFACE(ExtensionSystem::IPlugin, NL_STUDIO_IPLUGIN_IID)

 #endif // IPLUGIN_H
--- a/code/studio/src/extension_system/iplugin_manager.h
+++ b/code/studio/src/extension_system/iplugin_manager.h
@ -21,10 +21,10 @@

 #include "iplugin_spec.h"

-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QSettings>
+#include <QList>
+#include <QObject>
+#include <QStringList>
+#include <QSettings>

 namespace ExtensionSystem
 {
--- a/code/studio/src/extension_system/iplugin_spec.h
+++ b/code/studio/src/extension_system/iplugin_spec.h
@ -19,7 +19,7 @@
 #ifndef IPLUGINSPEC_H
 #define IPLUGINSPEC_H

-#include <QtCore/QString>
+#include <QString>

 namespace ExtensionSystem
 {
--- a/code/studio/src/plugins/CMakeLists.txt
+++ b/code/studio/src/plugins/CMakeLists.txt
@ -1,24 +1,24 @@
 ADD_SUBDIRECTORY(core)
-ADD_SUBDIRECTORY(example)
-ADD_SUBDIRECTORY(ovqt_sheet_builder)
-ADD_SUBDIRECTORY(landscape_editor)
-ADD_SUBDIRECTORY(log)
-ADD_SUBDIRECTORY(disp_sheet_id)
-ADD_SUBDIRECTORY(object_viewer)
-ADD_SUBDIRECTORY(georges_editor)
+#ADD_SUBDIRECTORY(example)
+#ADD_SUBDIRECTORY(ovqt_sheet_builder)
+#ADD_SUBDIRECTORY(landscape_editor)
+#ADD_SUBDIRECTORY(log)
+#ADD_SUBDIRECTORY(disp_sheet_id)
+#ADD_SUBDIRECTORY(object_viewer)
+#ADD_SUBDIRECTORY(georges_editor)

-ADD_SUBDIRECTORY(world_editor)
-IF(WITH_GUI)
-  ADD_SUBDIRECTORY(gui_editor)
-ENDIF(WITH_GUI)
+#ADD_SUBDIRECTORY(world_editor)
+#IF(WITH_GUI)
+#  ADD_SUBDIRECTORY(gui_editor)
+#ENDIF(WITH_GUI)

-ADD_SUBDIRECTORY(translation_manager)
-ADD_SUBDIRECTORY(tile_editor)
-ADD_SUBDIRECTORY(bnp_manager)
+#ADD_SUBDIRECTORY(translation_manager)
+#ADD_SUBDIRECTORY(tile_editor)
+#ADD_SUBDIRECTORY(bnp_manager)
 # Note: Temporarily disabled until development continues.
 #ADD_SUBDIRECTORY(zone_painter)

 # Ryzom Specific Plugins
-IF(WITH_RYZOM AND WITH_RYZOM_TOOLS)
-  ADD_SUBDIRECTORY(mission_compiler)
-ENDIF(WITH_RYZOM AND WITH_RYZOM_TOOLS)
+#IF(WITH_RYZOM AND WITH_RYZOM_TOOLS)
+#  ADD_SUBDIRECTORY(mission_compiler)
+#ENDIF(WITH_RYZOM AND WITH_RYZOM_TOOLS)
--- a/code/studio/src/plugins/core/CMakeLists.txt
+++ b/code/studio/src/plugins/core/CMakeLists.txt
@ -41,9 +41,16 @@ SET(OVQT_CORE_PLUGIN_RCS core.qrc)
 SET(QT_USE_QTGUI TRUE)
 SET(QT_USE_QTOPENGL TRUE)

-QT4_ADD_RESOURCES(OVQT_CORE_PLUGIN_RC_SRCS ${OVQT_CORE_PLUGIN_RCS})
-QT4_WRAP_CPP(OVQT_CORE_PLUGIN_MOC_SRC ${OVQT_CORE_PLUGIN_HDR})
-QT4_WRAP_UI(OVQT_CORE_PLUGIN_UI_HDRS ${OVQT_CORE_PLUGIN_UIS})
+IF(WITH_QT5)
+	SET(CMAKE_AUTOMOC OFF)
+	QT5_ADD_RESOURCES(OVQT_CORE_PLUGIN_RC_SRCS ${OVQT_CORE_PLUGIN_RCS})
+	QT5_WRAP_CPP(OVQT_CORE_PLUGIN_MOC_SRC ${OVQT_CORE_PLUGIN_HDR})
+	QT5_WRAP_UI(OVQT_CORE_PLUGIN_UI_HDRS ${OVQT_CORE_PLUGIN_UIS})
+ELSE(WITH_QT5)
+	QT4_ADD_RESOURCES(OVQT_CORE_PLUGIN_RC_SRCS ${OVQT_CORE_PLUGIN_RCS})
+	QT4_WRAP_CPP(OVQT_CORE_PLUGIN_MOC_SRC ${OVQT_CORE_PLUGIN_HDR})
+	QT4_WRAP_UI(OVQT_CORE_PLUGIN_UI_HDRS ${OVQT_CORE_PLUGIN_UIS})
+ENDIF(WITH_QT5)

 SOURCE_GROUP(QtResources FILES ${OVQT_CORE_PLUGIN_UIS} ${OVQT_CORE_PLUGIN_RCS})
 SOURCE_GROUP(QtGeneratedUiHdr FILES ${OVQT_CORE_PLUGIN_UI_HDRS})
@ -53,7 +60,15 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})

 ADD_LIBRARY(studio_plugin_core SHARED ${SRC} ${OVQT_CORE_PLUGIN_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_CORE_PLUGIN_RC_SRCS} ${OVQT_CORE_PLUGIN_UI_HDRS})

-TARGET_LINK_LIBRARIES(studio_plugin_core nelmisc nel3d ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(studio_plugin_core nelmisc nel3d)
+
+IF(WITH_QT5)
+	TARGET_LINK_LIBRARIES(studio_plugin_core
+		Qt5::Widgets)
+ELSE(WITH_QT5)
+	TARGET_LINK_LIBRARIES(studio_plugin_core
+		${QT_LIBRARIES})
+ENDIF(WITH_QT5)

 NL_DEFAULT_PROPS(studio_plugin_core "Tools: Studio Plugin: Core")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_core)
--- a/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
+++ b/code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
@ -63,7 +63,7 @@ void Nel3DWidget::init()
 	nlassert( driver == NULL );

 	driver = NL3D::UDriver::createDriver( 0, false, 0 );
-	driver->setDisplay( winId(), NL3D::UDriver::CMode( width(), height(), 32, true ) );
+	driver->setDisplay( (nlWindow)winId(), NL3D::UDriver::CMode( width(), height(), 32, true ) );
 }

 void Nel3DWidget::createTextContext( std::string fontFile )
--- a/code/studio/src/plugins/core/context_manager.cpp
+++ b/code/studio/src/plugins/core/context_manager.cpp
@ -24,8 +24,8 @@
 #include <nel/misc/debug.h>

 // Qt includes
-#include <QtGui/QTabWidget>
-#include <QtGui/QGridLayout>
+#include <QTabWidget>
+#include <QGridLayout>

 namespace Core
 {
--- a/code/studio/src/plugins/core/context_manager.h
+++ b/code/studio/src/plugins/core/context_manager.h
@ -22,7 +22,7 @@
 #include "core_global.h"

 // Qt includes
-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QTabWidget;
--- a/code/studio/src/plugins/core/core_global.h
+++ b/code/studio/src/plugins/core/core_global.h
@ -19,7 +19,7 @@
 #ifndef CORE_GLOBAL_H
 #define CORE_GLOBAL_H

-#include <QtCore/qglobal.h>
+#include <qglobal.h>

 #if defined(CORE_LIBRARY)
 #  define CORE_EXPORT Q_DECL_EXPORT
--- a/code/studio/src/plugins/core/core_plugin.cpp
+++ b/code/studio/src/plugins/core/core_plugin.cpp
@ -27,12 +27,12 @@
 #include "nel/misc/debug.h"

 // Qt includes
-#include <QtCore/QObject>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QMenuBar>
+#include <QObject>
+#include <QMessageBox>
+#include <QMainWindow>
+#include <QMenu>
+#include <QAction>
+#include <QMenuBar>

 using namespace Core;

@ -101,4 +101,4 @@ void CorePlugin::addAutoReleasedObject(QObject *obj)
 	m_autoReleaseObjects.prepend(obj);
 }

-Q_EXPORT_PLUGIN(CorePlugin)
+// Q_EXPORT_PLUGIN(CorePlugin)
--- a/code/studio/src/plugins/core/core_plugin.h
+++ b/code/studio/src/plugins/core/core_plugin.h
@ -23,7 +23,7 @@

 #include "nel/misc/app_context.h"

-#include <QtCore/QObject>
+#include <QObject>

 namespace NLMISC
 {
@ -41,6 +41,7 @@ namespace Core
 class CorePlugin : public QObject, public ExtensionSystem::IPlugin
 {
 	Q_OBJECT
+	Q_PLUGIN_METADATA(IID NL_STUDIO_IPLUGIN_IID)
 	Q_INTERFACES(ExtensionSystem::IPlugin)
 public:

--- a/code/studio/src/plugins/core/general_settings_page.cpp
+++ b/code/studio/src/plugins/core/general_settings_page.cpp
@ -24,12 +24,12 @@
 #include <nel/misc/path.h>

 // Qt includes
-#include <QtCore/QSettings>
-#include <QtGui/QWidget>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
-#include <QtGui/QStyleFactory>
-#include <QtGui/QStyle>
+#include <QSettings>
+#include <QWidget>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QStyleFactory>
+#include <QStyle>

 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/code/studio/src/plugins/core/general_settings_page.h
+++ b/code/studio/src/plugins/core/general_settings_page.h
@ -19,7 +19,7 @@
 #ifndef GENERAL_SETTINGS_PAGE_H
 #define GENERAL_SETTINGS_PAGE_H

-#include <QtCore/QObject>
+#include <QObject>

 #include "ioptions_page.h"

--- a/code/studio/src/plugins/core/icontext.h
+++ b/code/studio/src/plugins/core/icontext.h
@ -22,9 +22,9 @@
 #include "core_global.h"

 // Qt includes
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtGui/QIcon>
+#include <QObject>
+#include <QString>
+#include <QIcon>

 QT_BEGIN_NAMESPACE
 class QWidget;
--- a/code/studio/src/plugins/core/icore.h
+++ b/code/studio/src/plugins/core/icore.h
@ -21,7 +21,7 @@

 #include "core_global.h"

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QMainWindow;
--- a/code/studio/src/plugins/core/icore_listener.h
+++ b/code/studio/src/plugins/core/icore_listener.h
@ -23,7 +23,7 @@
 #include "core_global.h"

 // Qt includes
-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QWidget;
--- a/code/studio/src/plugins/core/ioptions_page.h
+++ b/code/studio/src/plugins/core/ioptions_page.h
@ -23,7 +23,7 @@
 #include "core_global.h"

 // Qt includes
-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QWidget;
--- a/code/studio/src/plugins/core/main_window.cpp
+++ b/code/studio/src/plugins/core/main_window.cpp
@ -29,9 +29,14 @@
 #include <nel/misc/debug.h>

 // Qt includes
-#include <QtCore/QCoreApplication>
-#include <QtGui/QUndoView>
-#include <QtGui/QtGui>
+#include <QCoreApplication>
+#include <QUndoView>
+#include <QtGui>
+#include <QMessageBox>
+#include <QDockWidget>
+#include <QStatusBar>
+#include <QUndoGroup>
+#include <QUndoStack>

 namespace Core
 {
--- a/code/studio/src/plugins/core/main_window.h
+++ b/code/studio/src/plugins/core/main_window.h
@ -25,9 +25,9 @@
 // STL includes

 // Qt includes
-#include <QtGui/QMainWindow>
-#include <QtGui/QUndoGroup>
-#include <QtCore/QSettings>
+#include <QMainWindow>
+#include <QUndoGroup>
+#include <QSettings>

 namespace Core
 {
--- a/code/studio/src/plugins/core/menu_manager.h
+++ b/code/studio/src/plugins/core/menu_manager.h
@ -22,12 +22,12 @@
 #include "core_global.h"

 // Qt includes
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QMenuBar>
+#include <QHash>
+#include <QObject>
+#include <QList>
+#include <QMenu>
+#include <QAction>
+#include <QMenuBar>

 namespace Core
 {
--- a/code/studio/src/plugins/core/plugin_view_dialog.cpp
+++ b/code/studio/src/plugins/core/plugin_view_dialog.cpp
@ -21,10 +21,10 @@
 #include "nel/misc/debug.h"

 // Qt includes
-#include <QtCore/QDir>
-#include <QtGui/QIcon>
-#include <QtGui/QStyle>
-#include <QtGui/QTreeWidgetItem>
+#include <QDir>
+#include <QIcon>
+#include <QStyle>
+#include <QTreeWidgetItem>
 #include <QMessageBox>
 #include <QFileDialog>

--- a/code/studio/src/plugins/core/plugin_view_dialog.h
+++ b/code/studio/src/plugins/core/plugin_view_dialog.h
@ -20,8 +20,8 @@

 #include "ui_plugin_view_dialog.h"

-#include <QtCore/QMap>
-#include <QtCore/QStringList>
+#include <QMap>
+#include <QStringList>

 namespace ExtensionSystem
 {
--- a/code/studio/src/plugins/core/search_paths_settings_page.cpp
+++ b/code/studio/src/plugins/core/search_paths_settings_page.cpp
@ -24,9 +24,9 @@
 #include <nel/misc/path.h>

 // Qt includes
-#include <QtCore/QSettings>
-#include <QtGui/QWidget>
-#include <QtGui/QFileDialog>
+#include <QSettings>
+#include <QWidget>
+#include <QFileDialog>

 namespace Core
 {
--- a/code/studio/src/plugins/core/search_paths_settings_page.h
+++ b/code/studio/src/plugins/core/search_paths_settings_page.h
@ -19,7 +19,7 @@
 #ifndef SEARCH_PATHS_SETTINGS_PAGE_H
 #define SEARCH_PATHS_SETTINGS_PAGE_H

-#include <QtCore/QObject>
+#include <QObject>

 #include "ioptions_page.h"

--- a/code/studio/src/plugins/core/settings_dialog.cpp
+++ b/code/studio/src/plugins/core/settings_dialog.cpp
@ -21,8 +21,8 @@
 #include "ioptions_page.h"

 // Qt includes
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
+#include <QHeaderView>
+#include <QPushButton>

 struct PageData
 {
--- a/code/studio/src/plugins/core/settings_dialog.h
+++ b/code/studio/src/plugins/core/settings_dialog.h
@ -22,7 +22,7 @@
 #include "../core/ui_settings_dialog.h"

 // Qt includes
-#include <QtCore/QList>
+#include <QList>

 // Project includes
 #include "../../extension_system/iplugin_manager.h"