1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSql tests: Remove Windows CE and clean up code.

Browse Source 
Use the newly introduced QSysInfo::machineHostName() to determine
the host name in the shared header, removing the need to link
against the winsocket library. All Windows-specific .pro sections
can then be removed.

Task-number: QTBUG-51673
Change-Id: Iba990b886b16addd210639871065abde6de96516
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2016-03-10 14:06:06 +01:00
parent e82bdee165
commit 2ec7f2cfed
9 changed files with 4 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/sql/kernel/qsql/qsql.pro
View File

@ -3,9 +3,3 @@ TARGET = tst_qsql
SOURCES += tst_qsql.cpp SOURCES += tst_qsql.cpp
QT = core-private sql-private testlib QT = core-private sql-private testlib
wince {
DEPLOYMENT_PLUGIN += qsqlite
}
mingw: LIBS += -lws2_32

14
tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
View File

@ -3,17 +3,3 @@ TARGET = tst_qsqldatabase
SOURCES += tst_qsqldatabase.cpp SOURCES += tst_qsqldatabase.cpp
QT = core sql testlib core-private sql-private QT = core sql testlib core-private sql-private
win32: {
!wince: LIBS += -lws2_32
else: LIBS += -lws2
}
wince {
DEPLOYMENT_PLUGIN += qsqlite
testData.files = testdata
testData.path = .
DEPLOYMENT += testData
}

28
tests/auto/sql/kernel/qsqldatabase/tst_databases.h
View File

@ -43,20 +43,6 @@
#include <QtSql/private/qsqldriver_p.h> #include <QtSql/private/qsqldriver_p.h>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#if defined(Q_OS_WIN)
# include <qt_windows.h>
# if defined(Q_OS_WINCE) || defined(Q_OS_WINRT)
# include <winsock2.h>
# endif
#else
#include <unistd.h>
#endif
#if defined(Q_OS_WINRT)
static inline int qgethostname(char *name, int) { qstrcpy(name, "localhost"); return 9; }
#else
# define qgethostname gethostname
#endif
#define CHECK_DATABASE( db ) \ #define CHECK_DATABASE( db ) \
if ( !db.isValid() ) { qFatal( "db is Invalid" ); } if ( !db.isValid() ) { qFatal( "db is Invalid" ); }
@ -71,16 +57,10 @@ static QString qGetHostName()
{ {
static QString hostname; static QString hostname;
if ( !hostname.isEmpty() ) if (hostname.isEmpty()) {
return hostname; hostname = QSysInfo::machineHostName();
hostname.replace(QLatin1Char( '.' ), QLatin1Char( '_' ));
char hn[257]; hostname.replace(QLatin1Char( '-' ), QLatin1Char( '_' ));
if ( qgethostname( hn, 255 ) == 0 ) {
hn[256] = '\0';
hostname = QString::fromLatin1( hn );
hostname.replace( QLatin1Char( '.' ), QLatin1Char( '_' ) );
hostname.replace( QLatin1Char( '-' ), QLatin1Char( '_' ) );
} }
return hostname; return hostname;

13
tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
View File

@ -3,16 +3,3 @@ TARGET = tst_qsqldriver
SOURCES += tst_qsqldriver.cpp SOURCES += tst_qsqldriver.cpp
QT = core sql testlib core-private sql-private QT = core sql testlib core-private sql-private
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles
LIBS += -lws2
} else {
mingw {
LIBS += -lws2_32
} else:win32 {
LIBS += ws2_32.lib
}
}

9
tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
View File

@ -4,12 +4,3 @@ CONFIG += testcase
SOURCES += tst_qsqlquery.cpp SOURCES += tst_qsqlquery.cpp
QT = core sql testlib core-private sql-private QT = core sql testlib core-private sql-private
win32:!wince: LIBS += -lws2_32
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles
LIBS += -lws2
}

11
tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
View File

@ -3,14 +3,3 @@ TARGET = tst_qsqlthread
SOURCES += tst_qsqlthread.cpp SOURCES += tst_qsqlthread.cpp
QT = core sql testlib core-private sql-private QT = core sql testlib core-private sql-private
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles
LIBS += -lws2
} else {
win32:LIBS += -lws2_32
}

8
tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
View File

@ -3,11 +3,3 @@ TARGET = tst_qsqlquerymodel
SOURCES += tst_qsqlquerymodel.cpp SOURCES += tst_qsqlquerymodel.cpp
QT += widgets sql testlib core-private sql-private QT += widgets sql testlib core-private sql-private
wince {
DEPLOYMENT_PLUGIN += qsqlite
LIBS += -lws2
} else {
win32:LIBS += -lws2_32
}

13
tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
View File

@ -3,16 +3,3 @@ TARGET = tst_qsqlrelationaltablemodel
SOURCES += tst_qsqlrelationaltablemodel.cpp SOURCES += tst_qsqlrelationaltablemodel.cpp
QT = core sql testlib core-private sql-private QT = core sql testlib core-private sql-private
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles
LIBS += -lws2
} else {
mingw {
LIBS += -lws2_32
} else:win32 {
LIBS += ws2_32.lib
}
}

10
tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
View File

@ -3,13 +3,3 @@ TARGET = tst_qsqltablemodel
SOURCES += tst_qsqltablemodel.cpp SOURCES += tst_qsqltablemodel.cpp
QT = core core-private sql sql-private testlib QT = core core-private sql sql-private testlib
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles
LIBS += -lws2
} else {
win32:LIBS += -lws2_32
}