diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-12-09 15:56:38 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-12-09 15:56:38 (GMT) |
| commit | 346d3618bad19714b41ad45715cdef9488ce8969 (patch) | |
| tree | e387efc737ef26946b86763f6e2ef8b22d645ee7 | |
| parent | 5c8afa87bcb975681b42529456335583df314ff5 (diff) | |
| parent | 16e324adfad0775e37c9fe2800d5fa8b89a80a64 (diff) | |
| download | Qt-346d3618bad19714b41ad45715cdef9488ce8969.zip Qt-346d3618bad19714b41ad45715cdef9488ce8969.tar.gz Qt-346d3618bad19714b41ad45715cdef9488ce8969.tar.bz2 | |
Merge branch 'berlin-staging-2' into 4.6
| -rw-r--r-- | projects.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/projects.pro b/projects.pro index 497acd0..d405a5b 100644 --- a/projects.pro +++ b/projects.pro @@ -48,7 +48,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { contains(QT_BUILD_PARTS, tools) { include(translations/translations.pri) # ts targets } else { - SUBDIRS += tools/linguist/lrelease + !wince*:!symbian:SUBDIRS += tools/linguist/lrelease } SUBDIRS += translations # qm build step } else:isEqual(PROJECT, qmake) { diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index d3087dc..ab110e6 100644 --- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -146,7 +146,7 @@ void tst_QGraphicsLinearLayout::initTestCase() { // since the style will influence the results, we have to ensure // that the tests are run using the same style on all platforms -#ifdef Q_WS_S60 +#if defined( Q_WS_S60 )|| defined (Q_WS_WINCE) QApplication::setStyle(new QWindowsStyle); #else QApplication::setStyle(new QPlastiqueStyle); |