From d140f99fa3052c8957b9247d9c6f9bf47c6c2a92 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 17 Dec 2012 20:38:51 +0100 Subject: point dependencies to 'release' branches Change-Id: Id025dd987dc759941cc4022ee6814e8f599b562c Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- sync.profile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sync.profile b/sync.profile index 9ad1263a..78673d95 100644 --- a/sync.profile +++ b/sync.profile @@ -8,12 +8,12 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/stable", - "qtscript" => "refs/heads/stable", - "qtxmlpatterns" => "refs/heads/stable", - "qtdeclarative" => "refs/heads/stable", - "qtjsbackend" => "refs/heads/stable", - "qtactiveqt" => "refs/heads/stable", - "qttools" => "refs/heads/stable", - "qtwebkit" => "refs/heads/stable", + "qtbase" => "refs/heads/release", + "qtscript" => "refs/heads/release", + "qtxmlpatterns" => "refs/heads/release", + "qtdeclarative" => "refs/heads/release", + "qtjsbackend" => "refs/heads/release", + "qtactiveqt" => "refs/heads/release", + "qttools" => "refs/heads/release", + "qtwebkit" => "refs/heads/release", ); -- cgit v1.2.3 From 4de078842ae87a091567503e66c0162b7ac50ccd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 10 Jan 2013 12:13:56 +0100 Subject: test examples only in developer builds we don't want to actually build examples in production builds any more, so the test is bound to fail. Change-Id: I5c936a5b193aa575a0193dcf0968cce9c20c505f Reviewed-by: hjk Reviewed-by: Joerg Bornemann --- tests/auto/declarative/declarative.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index dbadbad5..d606325d 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - examples \ parserstress \ qdeclarativecomponent \ qdeclarativecontext \ @@ -24,6 +23,7 @@ SUBDIRS += \ contains(QT_CONFIG, private_tests) { SUBDIRS += \ + examples \ qdeclarativeanchors \ qdeclarativeanimatedimage \ qdeclarativeanimations \ -- cgit v1.2.3 From 758349e729134061bb29583846826c47badb0472 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 12 Jan 2013 09:16:33 +0100 Subject: doc: Fix namespace version to 5.0.1 for qhp documentation Change-Id: I995109869294f3106046a8fd8299b6300b4c567f Reviewed-by: hjk --- src/doc/qtdeclarative.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf index 6a87d453..96a769be 100644 --- a/src/doc/qtdeclarative.qdocconf +++ b/src/doc/qtdeclarative.qdocconf @@ -10,7 +10,7 @@ exampleinstallpath = declarative qhp.projects = QtDeclarative qhp.QtDeclarative.file = qtdeclarative.qhp -qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.500 +qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.501 qhp.QtDeclarative.virtualFolder = declarative qhp.QtDeclarative.indexTitle = Qt Quick qhp.QtDeclarative.indexRoot = -- cgit v1.2.3 From 6d613d589135d43e77d2987aef4f773e9f23dc07 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Jan 2013 09:34:28 +0100 Subject: make use of qtHaveModule() Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada Reviewed-by: Joerg Bornemann --- examples/declarative/declarative.pro | 2 +- src/declarative/declarative.pro | 2 +- src/declarative/util/util.pri | 2 +- src/imports/imports.pro | 4 ++-- src/plugins/plugins.pro | 2 +- tests/auto/declarative/declarative.pro | 6 +++--- tests/auto/declarative/examples/examples.pro | 4 ++-- tests/manual/declarative/declarative.pro | 2 +- tools/qml/qml.pri | 2 +- tools/qml/qml.pro | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 4079afc2..91378da9 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -28,7 +28,7 @@ SUBDIRS = \ ui-components # OpenGL shader examples requires opengl and they contain some C++ and need to be built -contains(QT_CONFIG, opengl): SUBDIRS += shadereffects +qtHaveModule(opengl): SUBDIRS += shadereffects # These examples contain no C++ and can simply be copied EXAMPLE_FILES = \ diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 365cb04e..c5741c2b 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,6 +1,6 @@ TARGET = QtDeclarative QT = core-private gui-private widgets-private script-private -!isEmpty(QT.xmlpatterns.name): QT_PRIVATE = xmlpatterns +qtHaveModule(xmlpatterns): QT_PRIVATE = xmlpatterns else: DEFINES += QT_NO_XMLPATTERNS MODULE=declarative diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 62fa8f16..3978b5eb 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -65,7 +65,7 @@ HEADERS += \ $$PWD/qdeclarativelistmodelworkeragent_p.h \ $$PWD/qlistmodelinterface_p.h -contains(QT_CONFIG, xmlpatterns) { +qtHaveModule(xmlpatterns) { QT+=xmlpatterns SOURCES += $$PWD/qdeclarativexmllistmodel.cpp HEADERS += $$PWD/qdeclarativexmllistmodel_p.h diff --git a/src/imports/imports.pro b/src/imports/imports.pro index aba013aa..2d7f4a55 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS += folderlistmodel particles gestures builtins.pro -contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders +qtHaveModule(opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders -!isEmpty(QT.webkitwidgets.name): SUBDIRS += webview +qtHaveModule(webkitwidgets): SUBDIRS += webview diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 49039871..7c4b8370 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS += qmltooling -contains(QT_CONFIG, designer):SUBDIRS += qdeclarativeview +qtHaveModule(designer): SUBDIRS += qdeclarativeview diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 1f442f30..27ae628d 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -75,12 +75,12 @@ contains(QT_CONFIG, private_tests) { qpacketprotocol # This test requires the xmlpatterns module - !contains(QT_CONFIG,xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel + !qtHaveModule(xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel } -contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin +qtHaveModule(opengl): SUBDIRS += qmlshadersplugin -!isEmpty(QT.webkit.name): SUBDIRS += qdeclarativewebview +qtHaveModule(webkit): SUBDIRS += qdeclarativewebview # Tests which should run in Pulse PULSE_TESTS = $$SUBDIRS diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 8ff6b6ef..f20c3415 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -2,8 +2,8 @@ CONFIG += testcase testcase.timeout = 400 # this test is slow TARGET = tst_examples -!contains(QT_CONFIG, webkit): DEFINES += QT_NO_WEBKIT -!contains(QT_CONFIG, xmlpatterns): DEFINES += QT_NO_XMLPATTERNS +!qtHaveModule(webkit): DEFINES += QT_NO_WEBKIT +!qtHaveModule(xmlpatterns): DEFINES += QT_NO_XMLPATTERNS QT += testlib contains(QT_CONFIG,declarative): QT += declarative diff --git a/tests/manual/declarative/declarative.pro b/tests/manual/declarative/declarative.pro index 337db2f9..a7a8bfb0 100644 --- a/tests/manual/declarative/declarative.pro +++ b/tests/manual/declarative/declarative.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin +qtHaveModule(opengl): SUBDIRS += qmlshadersplugin diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index c5f38808..09a2e50d 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -1,5 +1,5 @@ QT += declarative declarative-private script network sql core-private gui-private widgets-private -contains(QT_CONFIG, opengl) { +qtHaveModule(opengl) { QT += opengl DEFINES += GL_SUPPORTED } diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 669b4cea..80b1e19a 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -14,16 +14,16 @@ INSTALLS += target wince* { QT += xml - contains(QT_CONFIG, scripttools) { + qtHaveModule(scripttools) { QT += scripttools } contains(QT_CONFIG, phonon) { QT += phonon } - contains(QT_CONFIG, xmlpatterns) { + qtHaveModule(xmlpatterns) { QT += xmlpatterns } - contains(QT_CONFIG, webkitwidgets) { + qtHaveModule(webkitwidgets) { QT += webkitwidgets } } -- cgit v1.2.3 From f241b08b6e2078e0ff25419f554ea03279a69021 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Jan 2013 09:33:53 +0100 Subject: remove pointless conditionals it's not entirely clear why anything inside the declarative module would have a conditional on the presence of the declarative module ... Change-Id: Ie6e22840b6d1d63da90c7d02aedb14fd870191af Reviewed-by: Joerg Bornemann --- tests/auto/declarative/examples/examples.pro | 3 +-- tests/auto/declarative/moduleqt47/moduleqt47.pro | 3 +-- tests/auto/declarative/parserstress/parserstress.pro | 3 +-- tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro | 3 +-- .../qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro | 3 +-- .../auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro | 3 +-- .../declarative/qdeclarativeapplication/qdeclarativeapplication.pro | 3 +-- tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro | 3 +-- tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro | 3 +-- .../declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro | 3 +-- tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro | 3 +-- .../auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro | 3 +-- tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro | 3 +-- tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro | 3 +-- .../declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro | 3 +-- .../declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro | 3 +-- tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro | 3 +-- .../tst_qdeclarativedebugobservermode.pro | 3 +-- .../declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro | 3 +-- tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro | 3 +-- .../auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro | 3 +-- tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro | 3 +-- tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro | 3 +-- tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro | 3 +-- tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro | 3 +-- .../auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro | 3 +-- .../qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro | 3 +-- .../auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro | 3 +-- tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro | 3 +-- tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro | 3 +-- .../qdeclarativeimageprovider/qdeclarativeimageprovider.pro | 3 +-- .../declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro | 3 +-- tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro | 3 +-- .../declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro | 3 +-- tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro | 3 +-- tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro | 3 +-- .../auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro | 3 +-- tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro | 3 +-- .../qdeclarativelistreference/qdeclarativelistreference.pro | 3 +-- tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro | 3 +-- tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro | 3 +-- tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro | 3 +-- tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro | 3 +-- tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro | 3 +-- tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro | 3 +-- tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro | 3 +-- .../declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro | 3 +-- .../declarative/qdeclarativepositioners/qdeclarativepositioners.pro | 3 +-- tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro | 3 +-- .../declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro | 3 +-- tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro | 3 +-- tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro | 3 +-- .../qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro | 3 +-- .../qdeclarativespringanimation/qdeclarativespringanimation.pro | 3 +-- tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro | 3 +-- .../auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro | 3 +-- .../qdeclarativesystempalette/qdeclarativesystempalette.pro | 3 +-- tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro | 3 +-- tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro | 3 +-- tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro | 3 +-- tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro | 3 +-- .../auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro | 3 +-- tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro | 3 +-- tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro | 3 +-- .../qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro | 3 +-- .../declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro | 3 +-- .../qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro | 3 +-- .../declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro | 3 +-- tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro | 3 +-- tests/auto/declarative/qmlvisual/qmlvisual.pro | 3 +-- tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro | 3 +-- 71 files changed, 71 insertions(+), 142 deletions(-) diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index f20c3415..043fa5d0 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -5,8 +5,7 @@ TARGET = tst_examples !qtHaveModule(webkit): DEFINES += QT_NO_WEBKIT !qtHaveModule(xmlpatterns): DEFINES += QT_NO_XMLPATTERNS -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative +QT += testlib declarative macx:CONFIG -= app_bundle SOURCES += tst_examples.cpp diff --git a/tests/auto/declarative/moduleqt47/moduleqt47.pro b/tests/auto/declarative/moduleqt47/moduleqt47.pro index 93da5262..9cb96f01 100644 --- a/tests/auto/declarative/moduleqt47/moduleqt47.pro +++ b/tests/auto/declarative/moduleqt47/moduleqt47.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_moduleqt47 -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative gui widgets +QT += testlib declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_moduleqt47.cpp diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro index e314f426..dde784e4 100644 --- a/tests/auto/declarative/parserstress/parserstress.pro +++ b/tests/auto/declarative/parserstress/parserstress.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_parserstress -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative +QT += testlib declarative macx:CONFIG -= app_bundle SOURCES += tst_parserstress.cpp diff --git a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro index 912676d0..470d7da4 100644 --- a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro +++ b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanchors -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui gui-private core-private +QT += testlib declarative declarative-private widgets widgets-private gui gui-private core-private SOURCES += tst_qdeclarativeanchors.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index c49b305b..9fb6ac1b 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimatedimage -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private network widgets +QT += testlib declarative declarative-private network widgets HEADERS += ../shared/testhttpserver.h SOURCES += tst_qdeclarativeanimatedimage.cpp ../shared/testhttpserver.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro index 77fc0707..d6ff8a20 100644 --- a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimations -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private gui-private widgets-private +QT += testlib declarative declarative-private core-private gui-private widgets-private SOURCES += tst_qdeclarativeanimations.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro index cd896bb1..09cdfea6 100644 --- a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeapplication -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative gui-private widgets +QT += testlib declarative gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro index 18b04f57..2bef1495 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativebehaviors -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private widgets-private gui-private +QT += testlib declarative declarative-private core-private widgets-private gui-private SOURCES += tst_qdeclarativebehaviors.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index 09446c74..eef87e3e 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativebinding -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets +QT += testlib declarative declarative-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativebinding.cpp diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro index 0ed28acf..722a8bc1 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeborderimage -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets network +QT += testlib declarative declarative-private widgets network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index 5bd9e282..953993ed 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativecomponent -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative +QT += testlib declarative QT += script network widgets macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index e71c6327..e88d371b 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeconnection -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private gui-private widgets-private +QT += testlib declarative declarative-private gui core-private script-private gui-private widgets-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeconnection.cpp diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro index ef0ff142..2fb1ece9 100644 --- a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro +++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativecontext -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative +QT += testlib declarative SOURCES += tst_qdeclarativecontext.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro index 70b12e8b..e3bd07e3 100644 --- a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro +++ b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebug -QT += testlib -contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private script-private gui-private widgets-private +QT += testlib network declarative declarative-private core-private script-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro index c99265b5..1e2ecc35 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro +++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugclient -QT += testlib -contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private +QT += testlib network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro index 1cde1be0..f6ee976b 100644 --- a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro +++ b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebughelper -QT += testlib -contains(QT_CONFIG,declarative): QT += network declarative declarative-private script script-private core-private +QT += testlib network declarative declarative-private script script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativedebughelper.cpp diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro index 4f972747..1257d2c6 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro @@ -2,8 +2,7 @@ CONFIG += testcase testcase.timeout = 600 # this test is slow TARGET = tst_qdeclarativedebugjs -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private network script core-private gui-private widgets-private +QT += testlib declarative declarative-private network script core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro b/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro index 008708be..a28aefdb 100644 --- a/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro +++ b/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugobservermode -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private network script core-private gui-private widgets-private +QT += testlib declarative declarative-private network script core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro index e27b324e..79b24a3b 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro +++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugservice -QT += testlib -contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private +QT += testlib network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro index 480ac463..db3abe1f 100644 --- a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro +++ b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedom -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private +QT += testlib declarative declarative-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativedom.cpp diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index 92f8d09f..0da15bf7 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeecmascript -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private network widgets core-private +QT += testlib declarative declarative-private script script-private network widgets core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro index 8004009f..0b997356 100644 --- a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro +++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeengine -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative network +QT += testlib declarative network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeengine.cpp diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro index df5efe09..6d6e866e 100644 --- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro +++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeerror -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative +QT += testlib declarative SOURCES += tst_qdeclarativeerror.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro index bc613081..03489621 100644 --- a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro +++ b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeflickable -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets script-private core-private +QT += testlib declarative declarative-private gui widgets script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeflickable.cpp diff --git a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro index c9770933..50dfc2d0 100644 --- a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro +++ b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeflipable -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private +QT += testlib declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeflipable.cpp diff --git a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro index 42ea0b8a..9a56e146 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro +++ b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefocusscope -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets +QT += testlib declarative declarative-private widgets SOURCES += tst_qdeclarativefocusscope.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro index fc876d13..d2a5f207 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefolderlistmodel -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative +QT += testlib declarative macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativefolderlistmodel.cpp diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro index 510cac65..4076d3ec 100644 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefontloader -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui network +QT += testlib declarative declarative-private gui network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro index 63979826..e410e2f2 100644 --- a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro +++ b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativegridview -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private +QT += testlib declarative declarative-private widgets widgets-private gui gui-private core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativegridview.cpp diff --git a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro index 2db10a00..d499edb1 100644 --- a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeimage -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets network +QT += testlib declarative declarative-private gui widgets network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index f57f9603..c6a48184 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeimageprovider -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private +QT += testlib declarative declarative-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro b/tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro index 725b6d6a..9c4b1413 100644 --- a/tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro +++ b/tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeimportorder -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative widgets +QT += testlib declarative widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeimportorder.cpp diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro index b71a6591..cd124854 100644 --- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro +++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeinfo -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative widgets +QT += testlib declarative widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeinfo.cpp diff --git a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro index ae354f0e..12ad5bf8 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro +++ b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeinstruction -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private core-private +QT += testlib declarative declarative-private script script-private core-private SOURCES += tst_qdeclarativeinstruction.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro index d25b77a4..9bf57ae3 100644 --- a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro +++ b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeitem -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets-private core-private +QT += testlib declarative declarative-private gui gui-private widgets-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeitem.cpp diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro index 11a31e9f..d7c87e6b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro +++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelanguage -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private +QT += testlib declarative declarative-private script-private core-private QT += script network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro index 87416bc6..7b576d2b 100644 --- a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro +++ b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelayoutitem -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets +QT += testlib declarative declarative-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelayoutitem.cpp diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index c9711b6c..25e17281 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistmodel -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private gui-private widgets-private +QT += testlib declarative declarative-private script-private core-private gui-private widgets-private QT += script macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro index 4c5dfeeb..df00a940 100644 --- a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro +++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistreference -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative +QT += testlib declarative macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelistreference.cpp diff --git a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro index b5911ac8..63cb92c1 100644 --- a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro +++ b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistview -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui-private core-private script-private +QT += testlib declarative declarative-private widgets widgets-private gui-private core-private script-private macx:CONFIG -= app_bundle HEADERS += incrementalmodel.h diff --git a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro index 81b993c1..bbac0896 100644 --- a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeloader -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui network widgets +QT += testlib declarative declarative-private gui network widgets macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro index 256f3ebd..136de5d9 100644 --- a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro +++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemetatype -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets +QT += testlib declarative declarative-private widgets SOURCES += tst_qdeclarativemetatype.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro index 660c90bb..10d3eaf9 100644 --- a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro +++ b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemousearea -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets gui network +QT += testlib declarative declarative-private widgets gui network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro index 014cd170..29895c27 100644 --- a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro +++ b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeparticles -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative widgets +QT += testlib declarative widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeparticles.cpp diff --git a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro index 67fc41fb..bfb8e0bc 100644 --- a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro +++ b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepathview -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private +QT += testlib declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepathview.cpp diff --git a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro index 19e9272c..dbef493d 100644 --- a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro +++ b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepincharea -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui-private widgets +QT += testlib declarative declarative-private gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepincharea.cpp diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 1cc45276..8094d9a6 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepixmapcache -QT += testlib -contains(QT_CONFIG,declarative): QT += concurrent declarative declarative-private network +QT += testlib concurrent declarative declarative-private network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp diff --git a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro index a6aecebf..b7c5983d 100644 --- a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro +++ b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepositioners -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private gui-private widgets-private +QT += testlib declarative declarative-private core-private gui-private widgets-private SOURCES += tst_qdeclarativepositioners.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro index 732774b8..47d35ee9 100644 --- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro +++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeproperty -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private +QT += testlib declarative declarative-private script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeproperty.cpp diff --git a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro index d9706deb..c8d9316c 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro +++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepropertymap -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private +QT += testlib declarative declarative-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepropertymap.cpp diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index fa372083..cbe1f2bc 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeqt -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private core-private widgets +QT += testlib declarative declarative-private script script-private core-private widgets SOURCES += tst_qdeclarativeqt.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro index 9cb17a57..7e233023 100644 --- a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro +++ b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativerepeater -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets +QT += testlib declarative declarative-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativerepeater.cpp diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 556675ee..e52edc3f 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesmoothedanimation -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private widgets +QT += testlib declarative declarative-private gui core-private script-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesmoothedanimation.cpp diff --git a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro index da587545..c0b204a3 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativespringanimation -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private +QT += testlib declarative declarative-private gui core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativespringanimation.cpp diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro index 76730f32..f701c059 100644 --- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativestates -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private script-private widgets-private gui-private +QT += testlib declarative declarative-private core-private script-private widgets-private gui-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestates.cpp diff --git a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro index edf81986..7b64cc1b 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro +++ b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativestyledtext -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private +QT += testlib declarative declarative-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro index 3a08b5e0..aadd1bfe 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesystempalette -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets +QT += testlib declarative declarative-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro index 64481a08..5dd3f83e 100644 --- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetext -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private core-private script-private +QT += testlib declarative declarative-private gui gui-private widgets widgets-private core-private script-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro index d4a5e771..0b213d70 100644 --- a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetextedit -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private network core-private +QT += testlib declarative declarative-private gui gui-private widgets widgets-private network core-private macx:CONFIG -= app_bundle include(../shared/qdeclarativedatatest.pri) diff --git a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro index ab012ffb..0a2a5aef 100644 --- a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro +++ b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetextinput -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private core-private +QT += testlib declarative declarative-private gui gui-private widgets widgets-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetextinput.cpp diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro index 35260dca..137fa121 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetimer -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private +QT += testlib declarative declarative-private gui core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro index 11611bea..6a3825d5 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro +++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativevaluetypes -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private script-private +QT += testlib declarative declarative-private core-private script-private macx:CONFIG -= app_bundle HEADERS += testtypes.h diff --git a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro index 98824f4d..f8bbd9f9 100644 --- a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro +++ b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeview -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative gui widgets +QT += testlib declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeview.cpp diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index 76dc50d8..9a1c3602 100644 --- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeviewer -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative gui +QT += testlib declarative gui macx:CONFIG -= app_bundle include(../../../../tools/qml/qml.pri) diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro index 25615747..57c4adc7 100644 --- a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro +++ b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativevisualdatamodel -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private +QT += testlib declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativevisualdatamodel.cpp diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro index 8301f7dc..1abc2433 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro +++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeworkerscript -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script core-private script-private +QT += testlib declarative declarative-private script core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeworkerscript.cpp diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 85679451..df8d2995 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -2,8 +2,7 @@ CONFIG += testcase testcase.timeout = 1200 # this is a slow test TARGET = tst_qdeclarativexmlhttprequest -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative network +QT += testlib declarative network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 0776efca..1e72011f 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativexmllistmodel -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private script gui network core-private script-private xmlpatterns +QT += testlib declarative declarative-private script gui network core-private script-private xmlpatterns macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativexmllistmodel.cpp diff --git a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro index 7053b003..b01caedc 100644 --- a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro +++ b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qmlshadersplugin -QT += testlib -QT += opengl declarative gui widgets +QT += testlib opengl declarative gui widgets SOURCES += tst_qmlshadersplugin.cpp SOURCES += \ diff --git a/tests/auto/declarative/qmlvisual/qmlvisual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro index bf991199..0cefe427 100644 --- a/tests/auto/declarative/qmlvisual/qmlvisual.pro +++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro @@ -2,8 +2,7 @@ CONFIG += testcase testcase.timeout = 600 # this test is slow TARGET = tst_qmlvisual -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative gui widgets +QT += testlib declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qmlvisual.cpp diff --git a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro index 131c53da..f72d8731 100644 --- a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro +++ b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qpacketprotocol -QT += testlib -contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private +QT += testlib network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h -- cgit v1.2.3 From 515198a448975b1fa7daf295b86f9dbc4da04ee9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 30 Jan 2013 17:40:11 +0100 Subject: substitute fixed version numbers in qdocconf files with variables Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b Reviewed-by: Jerome Pasion --- src/doc/qtdeclarative.qdocconf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf index 96a769be..e15a68c2 100644 --- a/src/doc/qtdeclarative.qdocconf +++ b/src/doc/qtdeclarative.qdocconf @@ -2,22 +2,22 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtDeclarative description = "Qt Declarative Examples Documentation" -url = http://qt-project.org/doc/qt-5.0/qtdeclarative -version = 5.0.1 +url = http://qt-project.org/doc/qt-$QT_VER/qtdeclarative +version = $QT_VERSION exampleinstallpath = declarative qhp.projects = QtDeclarative qhp.QtDeclarative.file = qtdeclarative.qhp -qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.501 +qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.$QT_VERSION_TAG qhp.QtDeclarative.virtualFolder = declarative qhp.QtDeclarative.indexTitle = Qt Quick qhp.QtDeclarative.indexRoot = -qhp.QtDeclarative.filterAttributes = declarative 5.0.1 qtrefdoc -qhp.QtDeclarative.customFilters.Qt.name = declarative 5.0.1 -qhp.QtDeclarative.customFilters.Qt.filterAttributes = declarative 5.0.1 +qhp.QtDeclarative.filterAttributes = declarative $QT_VERSION qtrefdoc +qhp.QtDeclarative.customFilters.Qt.name = declarative $QT_VERSION +qhp.QtDeclarative.customFilters.Qt.filterAttributes = declarative $QT_VERSION depends += qtcore qtgui qtscript qtdoc -- cgit v1.2.3 From e211fb349984f8b39c02057709efaa8ad16e8f59 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 12 Feb 2013 21:06:33 +0100 Subject: Remove QPointerBase bic check. QPointerBase is not public or exported and it is to be removed Change-Id: I0c99526c56d4df0276965427d1cd5d89b574ecb7 Reviewed-by: Thiago Macieira --- tests/auto/bic/data/QtDeclarative.5.0.0.linux-gcc-ia32.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/auto/bic/data/QtDeclarative.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDeclarative.5.0.0.linux-gcc-ia32.txt index 7cc0bfd4..daa9c2b4 100644 --- a/tests/auto/bic/data/QtDeclarative.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDeclarative.5.0.0.linux-gcc-ia32.txt @@ -2412,11 +2412,6 @@ QObjectCleanupHandler (0xb42ac5dc) 0 QObject (0xb409e578) 0 primary-for QObjectCleanupHandler (0xb42ac5dc) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb409eab8) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 -- cgit v1.2.3 From cf8ef1676b70d70f5e1d2725d0b24d7df5e8cfe4 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 14 Feb 2013 14:47:59 +0100 Subject: Doc: Removed reference to deprecated \badcode command. QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb Reviewed-by: Leena Miettinen Reviewed-by: Jerome Pasion --- src/declarative/graphicsitems/qdeclarativerepeater.cpp | 11 ++++++----- src/doc/src/declarative/anchor-layout.qdoc | 3 ++- src/doc/src/declarative/propertybinding.qdoc | 3 ++- src/doc/src/declarative/qdeclarativeintro.qdoc | 3 ++- src/doc/src/declarative/qtbinding.qdoc | 6 ++---- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 44721a9e..0e9a9be6 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -110,15 +110,16 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() The Repeater element creates all of its delegate items when the repeater is first created. This can be inefficient if there are a large number of delegate items and not all of the items are required to be visible at the same time. If this is the case, - consider using other view elements like ListView (which only creates delegate items - when they are scrolled into view) or use the \l {Dynamic Object Creation} methods to + consider using other view elements like ListView (which only creates delegate items + when they are scrolled into view) or use the \l {Dynamic Object Creation} methods to create items as they are required. - Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. + Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. For example, it cannot be used to repeat QtObjects: - \badcode + \code + //bad code Item { - //XXX does not work! Can't repeat QtObject as it doesn't derive from Item. + //Can't repeat QtObject as it doesn't derive from Item. Repeater { model: 10 QtObject {} diff --git a/src/doc/src/declarative/anchor-layout.qdoc b/src/doc/src/declarative/anchor-layout.qdoc index a1c83cec..8aff358a 100644 --- a/src/doc/src/declarative/anchor-layout.qdoc +++ b/src/doc/src/declarative/anchor-layout.qdoc @@ -124,7 +124,8 @@ edge, the margin is not applied. For performance reasons, you can only anchor an item to its siblings and direct parent. For example, the following anchor is invalid and would produce a warning: -\badcode +\code +//bad code Item { id: group1 Rectangle { id: rect1; ... } diff --git a/src/doc/src/declarative/propertybinding.qdoc b/src/doc/src/declarative/propertybinding.qdoc index 60de77ce..450d2265 100644 --- a/src/doc/src/declarative/propertybinding.qdoc +++ b/src/doc/src/declarative/propertybinding.qdoc @@ -109,7 +109,8 @@ properties only allow you to assign a value that matches the property type. For example, if a property is a real, and if you try to assign a string to it you will get an error. -\badcode +\code +//bad code property real volume: "four" //generates an error \endcode diff --git a/src/doc/src/declarative/qdeclarativeintro.qdoc b/src/doc/src/declarative/qdeclarativeintro.qdoc index 8fdc03aa..e5e52407 100644 --- a/src/doc/src/declarative/qdeclarativeintro.qdoc +++ b/src/doc/src/declarative/qdeclarativeintro.qdoc @@ -212,7 +212,8 @@ QML properties are what is known as \e type-safe. That is, they only allow you t matches the property type. For example, the \c x property of item is a real, and if you try to assign a string to it you will get an error. -\badcode +\code +//bad code Item { x: "hello" // illegal! } diff --git a/src/doc/src/declarative/qtbinding.qdoc b/src/doc/src/declarative/qtbinding.qdoc index 58d28159..f173025c 100644 --- a/src/doc/src/declarative/qtbinding.qdoc +++ b/src/doc/src/declarative/qtbinding.qdoc @@ -391,8 +391,8 @@ say you have a custom element \c PushButton with a \c buttonText property that i the value of a \c m_buttonText member variable. Modifying the member variable directly like this is not a good idea: -\badcode -// BAD! +\code +//bad code QDeclarativeComponent component(engine, "MyButton.qml"); PushButton *button = qobject_cast(component.create()); button->m_buttonText = "Click me"; @@ -665,5 +665,3 @@ be used to build the application resources: See \l {The Qt Resource System} for more information. */ - - -- cgit v1.2.3