Fix FTBFS due to hidden visibility

(cherry picked from commit 5347950651)
v3.5.13-sru
Slávek Banko 12 years ago
parent e3a418d757
commit 670b1431fa

@ -58,7 +58,7 @@ void set_splash_status( const QString &txt )
splash->message( splashText, Qt::AlignRight|Qt::AlignTop ); splash->message( splashText, Qt::AlignRight|Qt::AlignTop );
} }
DesignerApplication::DesignerApplication( int &argc, char **argv ) Q_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv )
: QApplication( argc, argv ) : QApplication( argc, argv )
{ {
#if defined(Q_WS_WIN) #if defined(Q_WS_WIN)
@ -69,7 +69,7 @@ DesignerApplication::DesignerApplication( int &argc, char **argv )
#endif #endif
} }
QSplashScreen *DesignerApplication::showSplash() Q_EXPORT QSplashScreen *DesignerApplication::showSplash()
{ {
QRect screen = QApplication::desktop()->screenGeometry(); QRect screen = QApplication::desktop()->screenGeometry();
QSettings config; QSettings config;
@ -101,7 +101,7 @@ void DesignerApplication::closeSplash()
static QString *settings_key = 0; static QString *settings_key = 0;
static QString *old_settings_key = 0; static QString *old_settings_key = 0;
QString DesignerApplication::settingsKey() Q_EXPORT QString DesignerApplication::settingsKey()
{ {
if ( !settings_key ) if ( !settings_key )
settings_key = new QString( "/Qt Designer/" + settings_key = new QString( "/Qt Designer/" +

@ -129,7 +129,7 @@ extern void set_splash_status( const QString &txt );
extern QObject* qwf_form_object; extern QObject* qwf_form_object;
extern QString *qwf_plugin_dir; extern QString *qwf_plugin_dir;
MainWindow *MainWindow::self = 0; Q_EXPORT MainWindow *MainWindow::self = 0;
QString assistantPath() QString assistantPath()
{ {
@ -150,7 +150,7 @@ static QString textNoAccel( const QString& text)
} }
MainWindow::MainWindow( bool asClient, bool single, const QString &plgDir ) Q_EXPORT MainWindow::MainWindow( bool asClient, bool single, const QString &plgDir )
: QMainWindow( 0, "designer_mainwindow", WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader ), : QMainWindow( 0, "designer_mainwindow", WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader ),
grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
fileFilter( tr( "Qt User-Interface Files (*.ui)" ) ), client( asClient ), fileFilter( tr( "Qt User-Interface Files (*.ui)" ) ), client( asClient ),

@ -1188,7 +1188,7 @@ void MainWindow::projectInsertFile()
fileOpen( "", "" ); fileOpen( "", "" );
} }
void MainWindow::fileOpen( const QString &filter, const QString &extension, const QString &fn, bool inProject ) Q_EXPORT void MainWindow::fileOpen( const QString &filter, const QString &extension, const QString &fn, bool inProject )
{ {
statusBar()->message( tr( "Open a file...") ); statusBar()->message( tr( "Open a file...") );
@ -1291,7 +1291,7 @@ void MainWindow::fileOpen( const QString &filter, const QString &extension, cons
} }
} }
FormWindow *MainWindow::openFormWindow( const QString &filename, bool validFileName, FormFile *ff ) Q_EXPORT FormWindow *MainWindow::openFormWindow( const QString &filename, bool validFileName, FormFile *ff )
{ {
if ( filename.isEmpty() ) if ( filename.isEmpty() )
return 0; return 0;

@ -45,7 +45,7 @@
#include <qpainter.h> #include <qpainter.h>
static QTextEdit *debugoutput = 0; static QTextEdit *debugoutput = 0;
bool debugToStderr = FALSE; Q_EXPORT bool debugToStderr = FALSE;
QtMsgHandler OutputWindow::oldMsgHandler = 0; QtMsgHandler OutputWindow::oldMsgHandler = 0;

@ -283,7 +283,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image
out << "static QMimeSourceFactory* factory = 0;\n"; out << "static QMimeSourceFactory* factory = 0;\n";
out << "\n"; out << "\n";
out << "void qInitImages_" << cProject << "()\n"; out << "Q_EXPORT void qInitImages_" << cProject << "()\n";
out << "{\n"; out << "{\n";
out << " if ( !factory ) {\n"; out << " if ( !factory ) {\n";
out << "\tfactory = new MimeSourceFactory_" << cProject << ";\n"; out << "\tfactory = new MimeSourceFactory_" << cProject << ";\n";

Loading…
Cancel
Save