remove redundant QT_PLUGIN definition

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/io/qsettings.cpp b/src/core/io/qsettings.cpp
index 30efe5e..b631ac9 100644 (file)
--- a/src/core/io/qsettings.cpp
+++ b/src/core/io/qsettings.cpp
@@ -298,8 +298,10 @@ void QSettingsPrivate::read()
 
 void QSettingsPrivate::write()
 {
-    if (!shouldwrite)
+    if (!shouldwrite) {
         return;
+    }
+
     QMutexLocker locker(qSettingsMutex());
     QFile file(filename);
     if (Q_UNLIKELY(!file.open(QFile::WriteOnly))) {

diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
index 8af89cc..162f9fa 100644 (file)
--- a/src/gui/styles/qcleanlooksstyle.cpp
+++ b/src/gui/styles/qcleanlooksstyle.cpp
@@ -34,7 +34,7 @@
 #include "qcleanlooksstyle.h"
 #include "qcleanlooksstyle_p.h"
 
-#if !defined(QT_NO_STYLE_CLEANLOOKS) || defined(QT_PLUGIN)
+#if !defined(QT_NO_STYLE_CLEANLOOKS)
 
 #include "qwindowsstyle_p.h"
 #include "qcombobox.h"
@@ -4359,6 +4359,4 @@ QT_END_NAMESPACE
 
 #include "moc_qcleanlooksstyle.h"
 
-#endif // QT_NO_STYLE_CLEANLOOKS || QT_PLUGIN
-
-
+#endif // QT_NO_STYLE_CLEANLOOKS

diff --git a/src/gui/styles/qmotifstyle.cpp b/src/gui/styles/qmotifstyle.cpp
index 9d92244..1c81f8b 100644 (file)
--- a/src/gui/styles/qmotifstyle.cpp
+++ b/src/gui/styles/qmotifstyle.cpp
@@ -33,7 +33,7 @@
 
 #include "qmotifstyle.h"
 
-#if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
+#if !defined(QT_NO_STYLE_MOTIF)
 
 #include "qmenu.h"
 #include "qapplication.h"
@@ -2375,4 +2375,4 @@ QT_END_NAMESPACE
 
 #include "moc_qmotifstyle.h"
 
-#endif // !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
+#endif // !defined(QT_NO_STYLE_MOTIF)

diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp
index e09e663..a43c85a 100644 (file)
--- a/src/gui/styles/qplastiquestyle.cpp
+++ b/src/gui/styles/qplastiquestyle.cpp
@@ -33,7 +33,7 @@
 
 #include "qplastiquestyle.h"
 
-#if !defined(QT_NO_STYLE_PLASTIQUE) || defined(QT_PLUGIN)
+#if !defined(QT_NO_STYLE_PLASTIQUE)
 
 static const bool AnimateBusyProgressBar = true;
 static const bool AnimateProgressBar = false;
@@ -5818,4 +5818,4 @@ QT_END_NAMESPACE
 
 #include "moc_qplastiquestyle.h"
 
-#endif // !defined(QT_NO_STYLE_PLASTIQUE) || defined(QT_PLUGIN)
+#endif // !defined(QT_NO_STYLE_PLASTIQUE)

diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index 6749c00..ea594fc 100644 (file)
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -34,7 +34,7 @@
 #include "qwindowsstyle.h"
 #include "qwindowsstyle_p.h"
 
-#if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
+#if !defined(QT_NO_STYLE_WINDOWS)
 
 #include "qapplication.h"
 #include "qbitmap.h"

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 8b837e4..2d1a9bf 100644 (file)
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_definitions(-DQT_PLUGIN)
-
 include_directories(
     ${CMAKE_BINARY_DIR}/include
     ${CMAKE_BINARY_DIR}/privateinclude

diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.h b/src/plugins/sqldrivers/mysql/qsql_mysql.h
index a72e5ec..5d7c4fa 100644 (file)
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.h
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.h
@@ -39,12 +39,6 @@
 
 #include <mysql.h>
 
-#ifdef QT_PLUGIN
-#define Q_EXPORT_SQLDRIVER_MYSQL
-#else
-#define Q_EXPORT_SQLDRIVER_MYSQL Q_SQL_EXPORT
-#endif
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -87,7 +81,7 @@ private:
     QMYSQLResultPrivate* d;
 };
 
-class Q_EXPORT_SQLDRIVER_MYSQL QMYSQLDriver : public QSqlDriver
+class QMYSQLDriver : public QSqlDriver
 {
     Q_OBJECT
     friend class QMYSQLResult;

diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.h b/src/plugins/sqldrivers/odbc/qsql_odbc.h
index 1680a01..6028760 100644 (file)
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.h
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.h
@@ -37,12 +37,6 @@
 #include <QtSql/qsqldriver.h>
 #include <QtSql/qsqlresult.h>
 
-#ifdef QT_PLUGIN
-#define Q_EXPORT_SQLDRIVER_ODBC
-#else
-#define Q_EXPORT_SQLDRIVER_ODBC Q_SQL_EXPORT
-#endif
-
 #define HAVE_LONG_LONG 1 // force UnixODBC NOT to fall back to a struct for BIGINTs
 
 #include <sql.h>
@@ -88,7 +82,7 @@ private:
     QODBCPrivate *d;
 };
 
-class Q_EXPORT_SQLDRIVER_ODBC QODBCDriver : public QSqlDriver
+class QODBCDriver : public QSqlDriver
 {
     Q_OBJECT
 public:

diff --git a/src/plugins/sqldrivers/psql/qsql_psql.h b/src/plugins/sqldrivers/psql/qsql_psql.h
index 1820994..b0ccaad 100644 (file)
--- a/src/plugins/sqldrivers/psql/qsql_psql.h
+++ b/src/plugins/sqldrivers/psql/qsql_psql.h
@@ -37,12 +37,6 @@
 #include <QtSql/qsqlresult.h>
 #include <QtSql/qsqldriver.h>
 
-#ifdef QT_PLUGIN
-#define Q_EXPORT_SQLDRIVER_PSQL
-#else
-#define Q_EXPORT_SQLDRIVER_PSQL Q_SQL_EXPORT
-#endif
-
 QT_BEGIN_HEADER
 
 typedef struct pg_conn PGconn;
@@ -84,7 +78,7 @@ private:
     QPSQLResultPrivate *d;
 };
 
-class Q_EXPORT_SQLDRIVER_PSQL QPSQLDriver : public QSqlDriver
+class QPSQLDriver : public QSqlDriver
 {
     Q_OBJECT
 public: