diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-22 09:28:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-23 03:30:12 +0200 |
| commit | a758d5641c330504941b531cc62f836ea11919c7 (patch) | |
| tree | 23c111b1941a8b599a0453dd5e282dab8f190fcc /tests | |
| parent | 2014ab4500ba4cc83607436f2adc0c5b32bf1ad9 (diff) | |
| download | qtlocation-a758d5641c330504941b531cc62f836ea11919c7.tar.gz | |
Fixed compile of tests and examples.
Do not attempt to compile a private symbols autotest in a
public-symbols-only build.
Explicitly opt-in to QtWidgets where needed.
Replace QApplication with QGuiApplication where QtWidgets is not needed.
Change-Id: Id2312c65dcb8835e97d9afa506d64f612744d3d6
Reviewed-on: http://codereview.qt-project.org/5337
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/declarativetestplugin/declarativetestplugin.pro | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index ad5c6453..485aeeeb 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -26,3 +26,6 @@ SUBDIRS += geotestplugin \ contains(config_test_jsondb, yes) { SUBDIRS += qplacemanager_jsondb } + +!contains(QT_CONFIG,private-tests):SUBDIRS -= \ + sphere diff --git a/tests/declarativetestplugin/declarativetestplugin.pro b/tests/declarativetestplugin/declarativetestplugin.pro index 78afd0aa..d3091598 100644 --- a/tests/declarativetestplugin/declarativetestplugin.pro +++ b/tests/declarativetestplugin/declarativetestplugin.pro @@ -3,7 +3,7 @@ TARGETPATH = Qt/location/test include(../../src/imports/location/qlocationimport.pri) -QT += declarative location +QT += declarative location widgets DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH |