diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-11 12:39:09 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-11 12:39:09 +0200 |
| commit | 5e2b0aa1b344bc93af29d7977aa7e497bfc7a9cf (patch) | |
| tree | c478b00d1c04166f3c1c163971edb4575b065b13 /qtbase.pro | |
| parent | d1622207ba501b93bd83b88d61a5631d3d0da0cc (diff) | |
| parent | fda40e37df1152b5a8c572fe4bc53620bfcbcc45 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/gui/painting/qdrawhelper_p.h
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/painting/qpainter.cpp
src/gui/painting/qunifiedtoolbarsurface_mac.cpp
src/gui/painting/qunifiedtoolbarsurface_mac_p.h
src/openvg/openvg.pro
src/openvg/qpaintengine_vg.cpp
src/openvg/qwindowsurface_vg.cpp
src/openvg/qwindowsurface_vgegl.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/widgets/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/qtbase.pro b/qtbase.pro index 7e334501ae..375308a5cc 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -7,12 +7,19 @@ TEMPLATE = subdirs cross_compile: CONFIG += nostrip +module_qtbase_tests.subdir = tests +module_qtbase_tests.target = module-qtbase-tests +module_qtbase_tests.depends = module_qtbase_src +module_qtbase_tests.CONFIG = no_default_target no_default_install + #process the projects for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { isEqual(PROJECT, examples) { SUBDIRS += examples } else:isEqual(PROJECT, demos) { SUBDIRS += demos + } else:isEqual(PROJECT, tests) { + module_qtbase_tests.CONFIG -= no_default_target } else:isEqual(PROJECT, libs) { include(src/src.pro) } else:isEqual(PROJECT, qmake) { @@ -22,10 +29,6 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { } } -module_qtbase_tests.subdir = tests -module_qtbase_tests.target = module-qtbase-tests -module_qtbase_tests.depends = module_qtbase_src -module_qtbase_tests.CONFIG = no_default_target no_default_install SUBDIRS += module_qtbase_tests !symbian: confclean.depends += clean |