summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-02 18:19:29 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-02 18:20:21 +0100
commit5347950651df37b37f54bbb2c28bbf5bfb17d746 (patch)
treec733c8339cd8059e0028ac8bad7a35e4f600dd16
parent1e11c1dd06345e7c4ed0c07e93e095502b28a603 (diff)
downloadqt3-5347950651df37b37f54bbb2c28bbf5bfb17d746.tar.gz
qt3-5347950651df37b37f54bbb2c28bbf5bfb17d746.zip
Fix FTBFS due to hidden visibility
-rw-r--r--tools/designer/designer/designerapp.cpp6
-rw-r--r--tools/designer/designer/mainwindow.cpp4
-rw-r--r--tools/designer/designer/mainwindowactions.cpp4
-rw-r--r--tools/designer/designer/outputwindow.cpp2
-rw-r--r--tools/designer/uic/embed.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp
index d546d1d..f12d316 100644
--- a/tools/designer/designer/designerapp.cpp
+++ b/tools/designer/designer/designerapp.cpp
@@ -58,7 +58,7 @@ void set_splash_status( const QString &txt )
splash->message( splashText, Qt::AlignRight|Qt::AlignTop );
}
-DesignerApplication::DesignerApplication( int &argc, char **argv )
+Q_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv )
: QApplication( argc, argv )
{
#if defined(Q_WS_WIN)
@@ -69,7 +69,7 @@ DesignerApplication::DesignerApplication( int &argc, char **argv )
#endif
}
-QSplashScreen *DesignerApplication::showSplash()
+Q_EXPORT QSplashScreen *DesignerApplication::showSplash()
{
QRect screen = QApplication::desktop()->screenGeometry();
QSettings config;
@@ -101,7 +101,7 @@ void DesignerApplication::closeSplash()
static QString *settings_key = 0;
static QString *old_settings_key = 0;
-QString DesignerApplication::settingsKey()
+Q_EXPORT QString DesignerApplication::settingsKey()
{
if ( !settings_key )
settings_key = new QString( "/Qt Designer/" +
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index d4f8af4..1263c6b 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -129,7 +129,7 @@ extern void set_splash_status( const QString &txt );
extern QObject* qwf_form_object;
extern QString *qwf_plugin_dir;
-MainWindow *MainWindow::self = 0;
+Q_EXPORT MainWindow *MainWindow::self = 0;
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 ),
grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
fileFilter( tr( "Qt User-Interface Files (*.ui)" ) ), client( asClient ),
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 94a115f..a29828f 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 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...") );
@@ -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() )
return 0;
diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp
index bd236a7..f18a3a4 100644
--- a/tools/designer/designer/outputwindow.cpp
+++ b/tools/designer/designer/outputwindow.cpp
@@ -45,7 +45,7 @@
#include <qpainter.h>
static QTextEdit *debugoutput = 0;
-bool debugToStderr = FALSE;
+Q_EXPORT bool debugToStderr = FALSE;
QtMsgHandler OutputWindow::oldMsgHandler = 0;
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index f6f09c4..b0ca530 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -283,7 +283,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image
out << "static QMimeSourceFactory* 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";