From 30f6a1d06723aac5168dcef32cba10cd99b85242 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 23 Jul 2009 12:10:46 +0200 Subject: linker fix for WinCE - link against correct library - theoretically it should be ok to use QHostInfo::localHostName(), but for this test it is fine Reviewed-by: Thomas Hartmann --- tests/auto/qsqldatabase/qsqldatabase.pro | 5 ++++- tests/auto/qsqldriver/qsqldriver.pro | 3 ++- tests/auto/qsqlquery/qsqlquery.pro | 3 ++- tests/auto/qsqlquerymodel/qsqlquerymodel.pro | 1 + tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro | 1 + tests/auto/qsqltablemodel/qsqltablemodel.pro | 3 ++- tests/auto/qsqlthread/qsqlthread.pro | 3 ++- 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro index 534a2d3..3bca79a 100644 --- a/tests/auto/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/qsqldatabase/qsqldatabase.pro @@ -5,7 +5,10 @@ QT += sql contains(QT_CONFIG, qt3support): QT += qt3support -win32:!wince*: LIBS += -lws2_32 +win32: { + !wince*: LIBS += -lws2_32 + else: LIBS += -lws2 +} wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/qsqldriver/qsqldriver.pro b/tests/auto/qsqldriver/qsqldriver.pro index 0024841..84f1cb2 100644 --- a/tests/auto/qsqldriver/qsqldriver.pro +++ b/tests/auto/qsqldriver/qsqldriver.pro @@ -6,7 +6,8 @@ QT += sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32-g++ { LIBS += -lws2_32 diff --git a/tests/auto/qsqlquery/qsqlquery.pro b/tests/auto/qsqlquery/qsqlquery.pro index d70ede3..7996637 100644 --- a/tests/auto/qsqlquery/qsqlquery.pro +++ b/tests/auto/qsqlquery/qsqlquery.pro @@ -10,5 +10,6 @@ QT = core sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro index 669db6e..6004ab0 100644 --- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro +++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro @@ -5,6 +5,7 @@ QT += sql wince*: { DEPLOYMENT_PLUGIN += qsqlite + LIBS += -lws2 } else { win32:LIBS += -lws2_32 } diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro index a35a56c..a25cb93 100644 --- a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro +++ b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro @@ -7,6 +7,7 @@ wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32-g++ { LIBS += -lws2_32 diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro index cf5fbea..170862e 100644 --- a/tests/auto/qsqltablemodel/qsqltablemodel.pro +++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro @@ -6,7 +6,8 @@ QT += sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32:LIBS += -lws2_32 } diff --git a/tests/auto/qsqlthread/qsqlthread.pro b/tests/auto/qsqlthread/qsqlthread.pro index 23aa598..9049f4c 100644 --- a/tests/auto/qsqlthread/qsqlthread.pro +++ b/tests/auto/qsqlthread/qsqlthread.pro @@ -7,7 +7,8 @@ QT = core sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32:LIBS += -lws2_32 } -- cgit v0.12