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 /examples/qtestlib | |
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 'examples/qtestlib')
-rw-r--r-- | examples/qtestlib/tutorial1/tutorial1.pro | 2 | ||||
-rw-r--r-- | examples/qtestlib/tutorial2/tutorial2.pro | 2 | ||||
-rw-r--r-- | examples/qtestlib/tutorial3/tutorial3.pro | 2 | ||||
-rw-r--r-- | examples/qtestlib/tutorial4/tutorial4.pro | 2 | ||||
-rw-r--r-- | examples/qtestlib/tutorial5/tutorial5.pro | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro index 2a9d032dd5..ca4c795fdb 100644 --- a/examples/qtestlib/tutorial1/tutorial1.pro +++ b/examples/qtestlib/tutorial1/tutorial1.pro @@ -1,5 +1,5 @@ SOURCES = testqstring.cpp -CONFIG += qtestlib +QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1 diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro index b459d25b97..8ff0f4b818 100644 --- a/examples/qtestlib/tutorial2/tutorial2.pro +++ b/examples/qtestlib/tutorial2/tutorial2.pro @@ -1,5 +1,5 @@ SOURCES = testqstring.cpp -CONFIG += qtestlib +QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2 diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro index 4985858d3d..732c7be6bd 100644 --- a/examples/qtestlib/tutorial3/tutorial3.pro +++ b/examples/qtestlib/tutorial3/tutorial3.pro @@ -1,5 +1,5 @@ SOURCES = testgui.cpp -CONFIG += qtestlib +QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3 diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro index 02d9020b84..9fa2f110d3 100644 --- a/examples/qtestlib/tutorial4/tutorial4.pro +++ b/examples/qtestlib/tutorial4/tutorial4.pro @@ -1,5 +1,5 @@ SOURCES = testgui.cpp -CONFIG += qtestlib +QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4 diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro index efdb1ce055..15a8b85956 100644 --- a/examples/qtestlib/tutorial5/tutorial5.pro +++ b/examples/qtestlib/tutorial5/tutorial5.pro @@ -1,5 +1,5 @@ SOURCES = benchmarking.cpp -CONFIG += qtestlib +QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5 |