Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Use Xcb plugin for Qt 5 under Linux

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-12-23 15:00:49 +01:00
parent 09e22e292d
commit 5d64a01f58
4 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/nel/tools/misc/crash_report/crash_report.cpp
View file

@ -80,16 +80,17 @@ public:
#include <QtPlugin> #include <QtPlugin>
#ifdef Q_OS_WIN32 #if defined(Q_OS_WIN32)
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#endif #elif defined(Q_OS_MAC)
#ifdef Q_OS_MAC
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
#endif #elif defined(Q_OS_UNIX)
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif #endif
int main( int argc, char **argv ) #endif
int main(int argc, char **argv)
{ {
#ifndef WIN32 #ifndef WIN32
// Workaround to default -style=gtk+ on recent Cinnamon versions // Workaround to default -style=gtk+ on recent Cinnamon versions
@ -111,14 +112,13 @@ int main( int argc, char **argv )
CCmdLineParser::parse( argc, argv, params ); CCmdLineParser::parse( argc, argv, params );
CCrashReportWidget w; CCrashReportWidget w;
w.setup( params ); w.setup(params);
w.show(); w.show();
int ret = app.exec(); int ret = app.exec();
if( ret != EXIT_SUCCESS ) if(ret != EXIT_SUCCESS)
return ret; return ret;
else else
return w.getReturnValue(); return w.getReturnValue();
} }

14
code/nel/tools/misc/message_box_qt/main.cpp
View file

@ -8,6 +8,20 @@
#include <QFile> #include <QFile>
#include <QMessageBox> #include <QMessageBox>
#ifdef QT_STATICPLUGIN
#include <QtPlugin>
#if defined(Q_OS_WIN32)
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#elif defined(Q_OS_MAC)
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
#elif defined(Q_OS_UNIX)
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);

14
code/nel/tools/misc/words_dic_qt/main.cpp
View file

@ -12,6 +12,20 @@
#define NL_WORDS_DIC_CFG "." #define NL_WORDS_DIC_CFG "."
#endif #endif
#ifdef QT_STATICPLUGIN
#include <QtPlugin>
#if defined(Q_OS_WIN32)
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#elif defined(Q_OS_MAC)
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
#elif defined(Q_OS_UNIX)
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

15
code/ryzom/tools/client/client_config_qt/main.cpp
View file

@ -25,18 +25,19 @@
#include <QtPlugin> #include <QtPlugin>
#ifdef Q_OS_WIN32 #if defined(Q_OS_WIN32)
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#endif #elif defined(Q_OS_MAC)
#ifdef Q_OS_MAC
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
#endif #elif defined(Q_OS_UNIX)
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif #endif
int main( sint32 argc, char **argv ) #endif
int main(sint32 argc, char **argv)
{ {
QApplication app( argc, argv ); QApplication app(argc, argv);
QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png")); QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png"));
QPixmap pixmap(":/resources/splash_screen.png" ); QPixmap pixmap(":/resources/splash_screen.png" );