diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 15:34:58 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-01 15:34:58 +0200 |
commit | 00ef07fe96f51cb309469454592daf5d4a92eb4b (patch) | |
tree | 59f34f603882644ba25fb4bbc893fcb64ea6b262 /mkspecs/features/qmltestcase.prf | |
parent | f05236a40d7ee9299c5855d70e542143a2d342c8 (diff) | |
parent | 7b6c3707dea3292b62cca02245a710f00db21427 (diff) |
Merge remote-tracking branch 'base/master' into refactor
Conflicts:
src/gui/embedded/qmousepc_qws.cpp
src/gui/embedded/qwslock.cpp
src/plugins/decorations/default/default.pro
src/plugins/decorations/styled/styled.pro
src/plugins/decorations/windows/windows.pro
src/plugins/gfxdrivers/ahi/ahi.pro
src/plugins/gfxdrivers/directfb/directfb.pro
src/plugins/gfxdrivers/eglnullws/eglnullws.pro
src/plugins/gfxdrivers/linuxfb/linuxfb.pro
src/plugins/gfxdrivers/qvfb/qvfb.pro
src/plugins/gfxdrivers/transformed/transformed.pro
src/plugins/gfxdrivers/vnc/vnc.pro
src/plugins/graphicssystems/meego/meego.pro
src/plugins/graphicssystems/opengl/opengl.pro
src/plugins/graphicssystems/openvg/openvg.pro
src/plugins/graphicssystems/shivavg/shivavg.pro
src/plugins/graphicssystems/trace/trace.pro
src/plugins/kbddrivers/linuxinput/linuxinput.pro
src/plugins/mousedrivers/linuxtp/linuxtp.pro
src/plugins/mousedrivers/pc/pc.pro
src/plugins/mousedrivers/tslib/tslib.pro
src/plugins/platforms/minimal/minimal.pro
tests/auto/qerrormessage/qerrormessage.pro
Diffstat (limited to 'mkspecs/features/qmltestcase.prf')
-rw-r--r-- | mkspecs/features/qmltestcase.prf | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/mkspecs/features/qmltestcase.prf b/mkspecs/features/qmltestcase.prf index a3d66e659e..5e60185493 100644 --- a/mkspecs/features/qmltestcase.prf +++ b/mkspecs/features/qmltestcase.prf @@ -1,20 +1,6 @@ CONFIG += testcase -!symbian { - INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtQuickTest -} else { - load(data_caging_paths) - - INCLUDEPATH+=$$MW_LAYER_PUBLIC_EXPORT_PATH(QtQuickTest) -} - -QT += declarative - -win32:CONFIG(debug, debug|release) { - LIBS += -lQtQuickTest$${QT_LIBINFIX}d -} else { - LIBS += -lQtQuickTest$${QT_LIBINFIX} -} +QT += declarative qmltest # If the .pro file specified an IMPORTPATH, then add that to # the command-line when the test is run. |