a1fe728fa5
Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
20 lines
400 B
Prolog
20 lines
400 B
Prolog
CONFIG += testcase
|
|
CONFIG += parallel_test
|
|
TARGET = tst_qsqlrelationaltablemodel
|
|
SOURCES += tst_qsqlrelationaltablemodel.cpp
|
|
|
|
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
|
|
}
|
|
}
|