From 3535f5f40c2e4e2cb3ddb8cbe9c1c95dba62150c Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 11 Apr 2014 08:59:43 +0200 Subject: Temporary fix for static build issues on Mac. This will be properly done when QTBUG-37638 is fixed. Change-Id: Ia58bacaf9876933555b7f91a91542997be1209c5 Reviewed-by: Kai Koehne --- src/src.pro | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index 72274cdc..26d111d8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,9 +5,10 @@ SUBDIRS += positioning plugins.depends = positioning SUBDIRS += plugins -positioning_doc_snippets.subdir = positioning/doc/snippets -positioning_doc_snippets.depends = positioning -SUBDIRS += positioning_doc_snippets +#TEMPORARY fix for static build errors (QTBUG-37638) +#positioning_doc_snippets.subdir = positioning/doc/snippets +#positioning_doc_snippets.depends = positioning +#SUBDIRS += positioning_doc_snippets #no point in building QtLocation without Qt3D qtHaveModule(3d) { @@ -19,9 +20,9 @@ qtHaveModule(3d) { plugins.depends += location qtHaveModule(quick):imports.depends += location - location_doc_snippets.subdir = location/doc/snippets - location_doc_snippets.depends = location - SUBDIRS += location_doc_snippets +# location_doc_snippets.subdir = location/doc/snippets +# location_doc_snippets.depends = location +# SUBDIRS += location_doc_snippets } qtHaveModule(quick) { -- cgit v1.2.1 From 8ff60b5f3b45457a180bd72e1b8ea84cd397d249 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Wed, 9 Apr 2014 11:44:19 +0200 Subject: Doc: Edited Qt Positioning example pages -added information on how to run the example (using an included file in qtbase/doc/global) -section changes and linked to module landing page. -assigning default thumbnail to an example. -updated copyright year in touched files. Task-number: QTBUG-33597 Change-Id: I6e78c3016d3f51dd99466ee37eff9632eb050d84 Reviewed-by: Alex Blasche Reviewed-by: Sze Howe Koh --- src/positioning/doc/qtpositioning.qdocconf | 2 ++ src/positioning/doc/src/examples/declarative-flickr.qdoc | 10 ++++++---- src/positioning/doc/src/examples/qtpositioning-examples.qdoc | 5 ++--- src/positioning/doc/src/examples/satelliteinfo.qdoc | 4 +++- src/positioning/doc/src/examples/weatherinfo.qdoc | 6 ++++-- 5 files changed, 17 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf index 10e7b19f..e2c0cc4b 100644 --- a/src/positioning/doc/qtpositioning.qdocconf +++ b/src/positioning/doc/qtpositioning.qdocconf @@ -55,3 +55,5 @@ imagedirs += images navigation.landingpage = "Qt Positioning" navigation.cppclassespage = "Qt Positioning C++ Classes" navigation.qmltypespage = "Qt Positioning QML Types" + +manifestmeta.thumbnail.names += "QtPositioning/Log File*" diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/declarative-flickr.qdoc index af8f4680..a1d0bb58 100644 --- a/src/positioning/doc/src/examples/declarative-flickr.qdoc +++ b/src/positioning/doc/src/examples/declarative-flickr.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -34,7 +34,7 @@ fetch local content from a web service. This is a small example, illustrating one of the very core parts of the - Qt Positioning API: the ability to retrieve and use the user's current + \l{Qt Positioning} API: the ability to retrieve and use the user's current geographic position. Key QML types shown in this example: @@ -45,7 +45,9 @@ \image qml-flickr-1.jpg - \section2 Retrieving the Current Position + \include examples-run.qdocinc + + \section1 Retrieving the Current Position Retrieving the user's current position is achieved using the PositionSource type. In this example, we instantiate the PositionSource as part of the @@ -67,7 +69,7 @@ \snippet flickr/flickrmobile/GeoTab.qml props - \section2 Using the Current Position + \section1 Using the Current Position The longitude and latitude values retrieved here are eventually set on in properties on the RestModel component. The RestModel is an XmlListModel, diff --git a/src/positioning/doc/src/examples/qtpositioning-examples.qdoc b/src/positioning/doc/src/examples/qtpositioning-examples.qdoc index ac1d79ec..331c5536 100644 --- a/src/positioning/doc/src/examples/qtpositioning-examples.qdoc +++ b/src/positioning/doc/src/examples/qtpositioning-examples.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -32,7 +32,6 @@ \ingroup all-examples \ingroup qtpositioning - These are the Qt Positioning examples. + These are the \l{Qt Positioning} examples. */ - diff --git a/src/positioning/doc/src/examples/satelliteinfo.qdoc b/src/positioning/doc/src/examples/satelliteinfo.qdoc index 1edb8f6c..6a3ee8cb 100644 --- a/src/positioning/doc/src/examples/satelliteinfo.qdoc +++ b/src/positioning/doc/src/examples/satelliteinfo.qdoc @@ -35,7 +35,7 @@ \ingroup qtpositioning-examples - Key Qt Positioning classes used in this example: + Key \l{Qt Positioning} classes used in this example: \list \li \l{QGeoSatelliteInfo} @@ -70,4 +70,6 @@ If the platform does not provide satellite information the application automatically switches into a demo mode whereby it continuously switches between predefined sets of satellite data. + + \include examples-run.qdocinc */ diff --git a/src/positioning/doc/src/examples/weatherinfo.qdoc b/src/positioning/doc/src/examples/weatherinfo.qdoc index 0c98cc04..a836d028 100644 --- a/src/positioning/doc/src/examples/weatherinfo.qdoc +++ b/src/positioning/doc/src/examples/weatherinfo.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -34,7 +34,7 @@ \ingroup qtpositioning-examples - Key Qt Positioning classes used in this example: + Key \l{Qt Positioning} classes used in this example: \list \li \l{QGeoPositionInfo} @@ -43,6 +43,8 @@ \image ../images/example-weatherinfo.png + \include examples-run.qdocinc + The key part of this example is the application's data model, contained in the WeatherData and AppModel classes. WeatherData represents the weather information taken from the HTTP service. It is a simple data class, but we -- cgit v1.2.1 From 9cbddccc24cdd4b51285ea9ecbf851f3eba2cd31 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 4 Apr 2014 15:13:18 +0200 Subject: Only build snippets in developer builds with enabled examples. Task-number: QTBUG-37638 Change-Id: I2277f3fa9aab252bfba2103bee7c2b89e92ca26f Reviewed-by: Oswald Buddenhagen --- src/src.pro | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index 72274cdc..fb2ecc63 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,9 +5,15 @@ SUBDIRS += positioning plugins.depends = positioning SUBDIRS += plugins -positioning_doc_snippets.subdir = positioning/doc/snippets -positioning_doc_snippets.depends = positioning -SUBDIRS += positioning_doc_snippets +contains(QT_CONFIG, private_tests) { + positioning_doc_snippets.subdir = positioning/doc/snippets + #plugin dependency required during static builds + positioning_doc_snippets.depends = positioning plugins + !contains(QT_BUILD_PARTS, examples) { + positioning_doc_snippets.CONFIG = no_default_target no_default_install + } + SUBDIRS += positioning_doc_snippets +} #no point in building QtLocation without Qt3D qtHaveModule(3d) { @@ -19,9 +25,15 @@ qtHaveModule(3d) { plugins.depends += location qtHaveModule(quick):imports.depends += location - location_doc_snippets.subdir = location/doc/snippets - location_doc_snippets.depends = location - SUBDIRS += location_doc_snippets + contains(QT_CONFIG, private_tests) { + location_doc_snippets.subdir = location/doc/snippets + #plugin dependency required during static builds + location_doc_snippets.depends = location plugins + !contains(QT_BUILD_PARTS, examples) { + location_doc_snippets.CONFIG = no_default_target no_default_install + } + SUBDIRS += location_doc_snippets + } } qtHaveModule(quick) { -- cgit v1.2.1 From 0b41fc5cf08257f64d3d46c87a06a61eaa56aee0 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Tue, 22 Apr 2014 22:44:24 +1000 Subject: Fix crash when initializing Nokia place categories. If network errors occur while initializing categories stale categories were left in the category tree which can result in unbounded recursion. Change-Id: I93a3b7a01f152473d25b492bba579b9300639bba Reviewed-by: Robin Burchell Reviewed-by: Alex Blasche --- .../nokia/qplacemanagerengine_nokiav2.cpp | 77 +++++++++++++--------- 1 file changed, 46 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index 5543d001..30ad5808 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -600,39 +600,43 @@ QPlaceReply *QPlaceManagerEngineNokiaV2::initializeCategories() if (m_categoryReply) return m_categoryReply.data(); - m_tempTree.clear(); - CategoryParser parser; + m_tempTree.clear(); + CategoryParser parser; - if (!parser.parse(m_localDataPath + QLatin1String("/offline/offline-mapping.json"))) { - PlaceCategoryNode rootNode; + if (parser.parse(m_localDataPath + QLatin1String("/offline/offline-mapping.json"))) { + m_tempTree = parser.tree(); + } else { + PlaceCategoryNode rootNode; - for (int i = 0; FIXED_CATEGORIES_indices[i] != -1; ++i) { - const QString id = QString::fromLatin1(FIXED_CATEGORIES_string + - FIXED_CATEGORIES_indices[i]); - m_tempTree.insert(id, PlaceCategoryNode()); - rootNode.childIds.append(id); - } + for (int i = 0; FIXED_CATEGORIES_indices[i] != -1; ++i) { + const QString id = QString::fromLatin1(FIXED_CATEGORIES_string + + FIXED_CATEGORIES_indices[i]); - m_tempTree.insert(QString(), rootNode); - } else { - m_tempTree = parser.tree(); - } + PlaceCategoryNode node; + node.category.setCategoryId(id); - //request all categories in the tree from the server - //because we don't want the root node, we remove it from the list - QStringList ids = m_tempTree.keys(); - ids.removeAll(QString()); - foreach (const QString &id, ids) { - QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/categories/places/") + id); - QNetworkReply *networkReply = sendRequest(requestUrl); - connect(networkReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished())); - connect(networkReply, SIGNAL(error(QNetworkReply::NetworkError)), - this, SLOT(categoryReplyError())); - - m_categoryRequests.insert(id, networkReply); + m_tempTree.insert(id, node); + rootNode.childIds.append(id); } + m_tempTree.insert(QString(), rootNode); + } + + //request all categories in the tree from the server + //because we don't want the root node, we remove it from the list + QStringList ids = m_tempTree.keys(); + ids.removeAll(QString()); + foreach (const QString &id, ids) { + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/categories/places/") + id); + QNetworkReply *networkReply = sendRequest(requestUrl); + connect(networkReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished())); + connect(networkReply, SIGNAL(error(QNetworkReply::NetworkError)), + this, SLOT(categoryReplyError())); + + m_categoryRequests.insert(id, networkReply); + } + QPlaceCategoriesReplyImpl *reply = new QPlaceCategoriesReplyImpl(this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), @@ -764,6 +768,8 @@ void QPlaceManagerEngineNokiaV2::categoryReplyFinished() if (!reply) return; + QString categoryId; + if (reply->error() == QNetworkReply::NoError) { QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); if (!document.isObject()) { @@ -777,7 +783,7 @@ void QPlaceManagerEngineNokiaV2::categoryReplyFinished() QJsonObject category = document.object(); - QString categoryId = category.value(QLatin1String("categoryId")).toString(); + categoryId = category.value(QLatin1String("categoryId")).toString(); if (m_tempTree.contains(categoryId)) { PlaceCategoryNode node = m_tempTree.value(categoryId); node.category.setName(category.value(QLatin1String("name")).toString()); @@ -786,14 +792,23 @@ void QPlaceManagerEngineNokiaV2::categoryReplyFinished() m_tempTree.insert(categoryId, node); } + } else { + categoryId = m_categoryRequests.key(reply); + PlaceCategoryNode rootNode = m_tempTree.value(QString()); + rootNode.childIds.removeAll(categoryId); + m_tempTree.insert(QString(), rootNode); + m_tempTree.remove(categoryId); } - m_categoryRequests.remove(m_categoryRequests.key(reply)); + m_categoryRequests.remove(categoryId); reply->deleteLater(); - if (m_categoryRequests.isEmpty() && m_categoryReply) { + if (m_categoryRequests.isEmpty()) { m_categoryTree = m_tempTree; - m_categoryReply.data()->emitFinished(); + m_tempTree.clear(); + + if (m_categoryReply) + m_categoryReply.data()->emitFinished(); } } -- cgit v1.2.1 From 273977d00178a70c837da4df1a931377fa9d33d8 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 16 Apr 2014 11:26:15 +0200 Subject: Add PLUGIN_CLASS_NAME declarations to plug-in projects This is required for automatic static linking and deployment. The test plug-ins are excluded from the automation based on the assumption that they are usually not needed. Change-Id: I7658c624101e3273767c1c10d77a87c89d5801ba Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche --- src/plugins/geoservices/nokia/nokia.pro | 1 + src/plugins/geoservices/osm/osm.pro | 1 + src/plugins/position/android/src/src.pro | 1 + src/plugins/position/blackberry/blackberry.pro | 1 + src/plugins/position/corelocation/corelocation.pro | 2 +- src/plugins/position/geoclue/geoclue.pro | 1 + src/plugins/position/gypsy/gypsy.pro | 1 + src/plugins/position/positionpoll/positionpoll.pro | 1 + src/plugins/position/simulator/simulator.pro | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index 647a0a4e..f9c6a5cc 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -8,6 +8,7 @@ contains(QT_CONFIG, location-china-support) { } PLUGIN_TYPE = geoservices +PLUGIN_CLASS_NAME = NokiaGeoServicePlugin load(qt_plugin) HEADERS += \ diff --git a/src/plugins/geoservices/osm/osm.pro b/src/plugins/geoservices/osm/osm.pro index 897ebbfc..cb82aeaa 100644 --- a/src/plugins/geoservices/osm/osm.pro +++ b/src/plugins/geoservices/osm/osm.pro @@ -2,6 +2,7 @@ TARGET = qtgeoservices_osm QT += location-private positioning-private network PLUGIN_TYPE = geoservices +PLUGIN_CLASS_NAME = OSMGeoServicePlugin load(qt_plugin) HEADERS += \ diff --git a/src/plugins/position/android/src/src.pro b/src/plugins/position/android/src/src.pro index a61b77b5..4f1e4412 100644 --- a/src/plugins/position/android/src/src.pro +++ b/src/plugins/position/android/src/src.pro @@ -2,6 +2,7 @@ TARGET = qtposition_android QT = core positioning PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = AndroidPositionPlugin load(qt_plugin) diff --git a/src/plugins/position/blackberry/blackberry.pro b/src/plugins/position/blackberry/blackberry.pro index e3543107..852f6dc7 100644 --- a/src/plugins/position/blackberry/blackberry.pro +++ b/src/plugins/position/blackberry/blackberry.pro @@ -2,6 +2,7 @@ TARGET = qtposition_blackberry QT = core positioning PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = BBPositionPlugin load(qt_plugin) INCLUDEPATH += $$QT.location.includes diff --git a/src/plugins/position/corelocation/corelocation.pro b/src/plugins/position/corelocation/corelocation.pro index 1a1a2a39..544d825a 100644 --- a/src/plugins/position/corelocation/corelocation.pro +++ b/src/plugins/position/corelocation/corelocation.pro @@ -2,7 +2,7 @@ TARGET = qtposition_cl QT = core positioning PLUGIN_TYPE = position -PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL +PLUGIN_CLASS_NAME = IOSPositionPlugin load(qt_plugin) INCLUDEPATH += $$QT.location.includes diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro index 5c318645..9db7839f 100644 --- a/src/plugins/position/geoclue/geoclue.pro +++ b/src/plugins/position/geoclue/geoclue.pro @@ -2,6 +2,7 @@ TARGET = qtposition_geoclue QT = core positioning PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = GeoCluePositionPlugin load(qt_plugin) HEADERS += \ diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro index f67d41e7..3bd9b144 100644 --- a/src/plugins/position/gypsy/gypsy.pro +++ b/src/plugins/position/gypsy/gypsy.pro @@ -2,6 +2,7 @@ TARGET = qtposition_gypsy QT = core positioning PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = GypsyPositionPlugin load(qt_plugin) HEADERS += \ diff --git a/src/plugins/position/positionpoll/positionpoll.pro b/src/plugins/position/positionpoll/positionpoll.pro index 1b7e38f5..4af58327 100644 --- a/src/plugins/position/positionpoll/positionpoll.pro +++ b/src/plugins/position/positionpoll/positionpoll.pro @@ -2,6 +2,7 @@ TARGET = qtposition_positionpoll QT = core positioning PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = PollPositionPlugin load(qt_plugin) SOURCES += \ diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro index 17948ca5..18d12dfb 100644 --- a/src/plugins/position/simulator/simulator.pro +++ b/src/plugins/position/simulator/simulator.pro @@ -2,6 +2,7 @@ TARGET = qtposition_simulator QT = core network positioning PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = SimulatorPositionPlugin load(qt_plugin) INCLUDEPATH += $$QT.location.includes -- cgit v1.2.1 From 2b7eebe5fad524abb203f2330454bacb37c95173 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 23 Apr 2014 08:31:19 +0200 Subject: Remove unnecessary private export macro This was discovered during a header review of Qt 5.3. Change-Id: Id852deb6fb5eadb43e643ac25e3b52dad7f7dd59 Reviewed-by: Liang Qi Reviewed-by: Aaron McCarthy --- src/positioning/qdoublevector2d_p.h | 2 +- src/positioning/qdoublevector3d_p.h | 2 +- src/positioning/qgeoprojection_p.h | 2 +- src/positioning/qpositioningglobal.h | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/positioning/qdoublevector2d_p.h b/src/positioning/qdoublevector2d_p.h index c3000f86..3eb77597 100644 --- a/src/positioning/qdoublevector2d_p.h +++ b/src/positioning/qdoublevector2d_p.h @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QDoubleVector3D; -class Q_POSITIONING_EXPORT_PRIVATE QDoubleVector2D +class Q_POSITIONING_EXPORT QDoubleVector2D { public: Q_DECL_CONSTEXPR inline QDoubleVector2D(); diff --git a/src/positioning/qdoublevector3d_p.h b/src/positioning/qdoublevector3d_p.h index 75966a36..38d6d9dc 100644 --- a/src/positioning/qdoublevector3d_p.h +++ b/src/positioning/qdoublevector3d_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -class Q_POSITIONING_EXPORT_PRIVATE QDoubleVector3D +class Q_POSITIONING_EXPORT QDoubleVector3D { public: Q_DECL_CONSTEXPR inline QDoubleVector3D(); diff --git a/src/positioning/qgeoprojection_p.h b/src/positioning/qgeoprojection_p.h index d0280030..c31daa86 100644 --- a/src/positioning/qgeoprojection_p.h +++ b/src/positioning/qgeoprojection_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class QGeoCoordinate; class QDoubleVector2D; -class Q_POSITIONING_EXPORT_PRIVATE QGeoProjection +class Q_POSITIONING_EXPORT QGeoProjection { public: static QDoubleVector2D coordToMercator(const QGeoCoordinate &coord); diff --git a/src/positioning/qpositioningglobal.h b/src/positioning/qpositioningglobal.h index 5d1c3dea..4a919ee6 100644 --- a/src/positioning/qpositioningglobal.h +++ b/src/positioning/qpositioningglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtPositioning module of the Qt Toolkit. @@ -48,14 +48,11 @@ QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_POSITIONING_LIB) # define Q_POSITIONING_EXPORT Q_DECL_EXPORT -# define Q_POSITIONING_EXPORT_PRIVATE Q_DECL_EXPORT # else # define Q_POSITIONING_EXPORT Q_DECL_IMPORT -# define Q_POSITIONING_EXPORT_PRIVATE Q_DECL_IMPORT # endif #else # define Q_POSITIONING_EXPORT -# define Q_POSITIONING_EXPORT_PRIVATE #endif -- cgit v1.2.1 From 27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 24 Apr 2014 13:30:57 +0200 Subject: Build snippet outside of example build configurations too. This is a partial revert of 9cbddccc24cdd4b51285ea9ecbf851f3eba2cd31. The CI does not test a combined developer-build and example configuration. Ensuring the snippet compiles is mostly a private test. This patch drops the additional example condition to provide an increased chance of compiling the snippets on the CI. So far the condition never triggered and hence the CI couldn't ensure a compiling snippet. Task-number: QTBUG-37638 Change-Id: I8e64bb2b53b0452c5168faeb37f2809e96ac6e77 Reviewed-by: Oswald Buddenhagen --- src/src.pro | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/src.pro b/src/src.pro index fb2ecc63..9d03f755 100644 --- a/src/src.pro +++ b/src/src.pro @@ -9,9 +9,7 @@ contains(QT_CONFIG, private_tests) { positioning_doc_snippets.subdir = positioning/doc/snippets #plugin dependency required during static builds positioning_doc_snippets.depends = positioning plugins - !contains(QT_BUILD_PARTS, examples) { - positioning_doc_snippets.CONFIG = no_default_target no_default_install - } + SUBDIRS += positioning_doc_snippets } @@ -29,9 +27,7 @@ qtHaveModule(3d) { location_doc_snippets.subdir = location/doc/snippets #plugin dependency required during static builds location_doc_snippets.depends = location plugins - !contains(QT_BUILD_PARTS, examples) { - location_doc_snippets.CONFIG = no_default_target no_default_install - } + SUBDIRS += location_doc_snippets } } -- cgit v1.2.1