From dab0c5cd15ce05ca022ec8229a8b3776607beaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 2 Feb 2014 18:19:30 +0100 Subject: [PATCH] Fix FTBFS due to hidden visibility --- tools/designer/designer/designerapp.cpp | 6 +++--- tools/designer/designer/mainwindow.cpp | 4 ++-- tools/designer/designer/mainwindowactions.cpp | 4 ++-- tools/designer/designer/outputwindow.cpp | 2 +- tools/designer/uic/embed.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp index f3347446..bea6ac4a 100644 --- a/tools/designer/designer/designerapp.cpp +++ b/tools/designer/designer/designerapp.cpp @@ -58,7 +58,7 @@ void set_splash_status( const TQString &txt ) splash->message( splashText, TQt::AlignRight|TQt::AlignTop ); } -DesignerApplication::DesignerApplication( int &argc, char **argv ) +Q_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv ) : TQApplication( argc, argv ) { #if defined(Q_WS_WIN) @@ -69,7 +69,7 @@ DesignerApplication::DesignerApplication( int &argc, char **argv ) #endif } -TQSplashScreen *DesignerApplication::showSplash() +Q_EXPORT TQSplashScreen *DesignerApplication::showSplash() { TQRect screen = TQApplication::desktop()->screenGeometry(); TQSettings config; @@ -101,7 +101,7 @@ void DesignerApplication::closeSplash() static TQString *settings_key = 0; static TQString *old_settings_key = 0; -TQString DesignerApplication::settingsKey() +Q_EXPORT TQString DesignerApplication::settingsKey() { if ( !settings_key ) settings_key = new TQString( "/TQt Designer/" + diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index a112a0ba..3c837a9d 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -129,7 +129,7 @@ extern void set_splash_status( const TQString &txt ); extern TQObject* qwf_form_object; extern TQString *qwf_plugin_dir; -MainWindow *MainWindow::self = 0; +Q_EXPORT MainWindow *MainWindow::self = 0; TQString assistantPath() { @@ -150,7 +150,7 @@ static TQString textNoAccel( const TQString& text) } -MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir ) +Q_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir ) : TQMainWindow( 0, "designer_mainwindow", WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader ), grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), fileFilter( tr( "TQt User-Interface Files (*.ui)" ) ), client( asClient ), diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index 9fb744b9..c0b4210b 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -1188,7 +1188,7 @@ void MainWindow::projectInsertFile() fileOpen( "", "" ); } -void MainWindow::fileOpen( const TQString &filter, const TQString &extension, const TQString &fn, bool inProject ) +Q_EXPORT void MainWindow::fileOpen( const TQString &filter, const TQString &extension, const TQString &fn, bool inProject ) { statusBar()->message( tr( "Open a file...") ); @@ -1291,7 +1291,7 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co } } -FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFileName, FormFile *ff ) +Q_EXPORT FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFileName, FormFile *ff ) { if ( filename.isEmpty() ) return 0; diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp index e54dc9de..dea1ae64 100644 --- a/tools/designer/designer/outputwindow.cpp +++ b/tools/designer/designer/outputwindow.cpp @@ -45,7 +45,7 @@ #include static TQTextEdit *debugoutput = 0; -bool debugToStderr = FALSE; +Q_EXPORT bool debugToStderr = FALSE; TQtMsgHandler OutputWindow::oldMsgHandler = 0; diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp index bd9088ea..b43233d1 100644 --- a/tools/designer/uic/embed.cpp +++ b/tools/designer/uic/embed.cpp @@ -283,7 +283,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima out << "static TQMimeSourceFactory* factory = 0;\n"; out << "\n"; - out << "void qInitImages_" << cProject << "()\n"; + out << "Q_EXPORT void qInitImages_" << cProject << "()\n"; out << "{\n"; out << " if ( !factory ) {\n"; out << "\tfactory = new MimeSourceFactory_" << cProject << ";\n";