various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 2823cee..d7dec76 100644 (file)
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -84,7 +84,6 @@
 #include <qimagepixmapcleanuphooks_p.h>
 #include "qcolormap.h"
 #include "qfile.h"
-#include "qlibrary.h"
 #include <qmutex.h>
 
 #if defined(QT_OPENGL_ES) && !defined(QT_NO_EGL)

diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 235e964..afa368c 100644 (file)
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -55,7 +55,6 @@
 #endif
 
 #include <qglframebufferobject.h>
-#include <qlibrary.h>
 #include <qimage.h>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/opengl/qglpixelbuffer_x11.cpp b/src/opengl/qglpixelbuffer_x11.cpp
index 14ce443..3fb4db8 100644 (file)
--- a/src/opengl/qglpixelbuffer_x11.cpp
+++ b/src/opengl/qglpixelbuffer_x11.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qlibrary.h>
+
 #include <qdebug.h>
 #include <qgl_p.h>
 #include <qt_x11_p.h>

diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index 63cc67b..728c223 100644 (file)
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -1089,7 +1089,7 @@ bool QMYSQLResult::exec()
 static int qMySqlConnectionCount = 0;
 static bool qMySqlInitHandledByUser = false;
 
-static void qLibraryInit()
+static inline void qLibraryInit()
 {
 #ifndef Q_NO_MYSQL_EMBEDDED
 # if MYSQL_VERSION_ID >= 40000
@@ -1107,7 +1107,7 @@ static void qLibraryInit()
 #endif // Q_NO_MYSQL_EMBEDDED
 }
 
-static void qLibraryEnd()
+static inline void qLibraryEnd()
 {
 #ifndef Q_NO_MYSQL_EMBEDDED
 # if MYSQL_VERSION_ID > 40000

diff --git a/src/tools/designer/qdesigner.cpp b/src/tools/designer/qdesigner.cpp
index 9700987..bfa17b1 100644 (file)
--- a/src/tools/designer/qdesigner.cpp
+++ b/src/tools/designer/qdesigner.cpp
@@ -246,7 +246,7 @@ bool QDesigner::event(QEvent *ev)
             m_suppressNewFormShow = false;
         return true;
     case QEvent::Close: {
-        bool eaten = true
+        bool eaten = true;
         QCloseEvent *closeEvent = static_cast<QCloseEvent *>(ev);
         closeEvent->setAccepted(m_workbench->handleClose());
         if (closeEvent->isAccepted()) {

diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp
index 46623f7..6b31f94 100644 (file)
--- a/src/uitools/quiloader.cpp
+++ b/src/uitools/quiloader.cpp
@@ -49,15 +49,14 @@
 #include <textbuilder_p.h>
 #include <ui4_p.h>
 
-#include <QtCore/qdebug.h>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QMap>
 #include <QtGui/QAction>
 #include <QtGui/QActionGroup>
 #include <QtGui/QApplication>
-#include <QtCore/QDir>
-#include <QtCore/QLibraryInfo>
 #include <QtGui/QLayout>
 #include <QtGui/QWidget>
-#include <QtCore/QMap>
 #include <QtGui/QTabWidget>
 #include <QtGui/QTreeWidget>
 #include <QtGui/QListWidget>