diff options
33 files changed, 470 insertions, 46 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..5b4d2f2440 --- /dev/null +++ b/.gitignore @@ -0,0 +1,261 @@ +# This file is used to ignore files which are generated in the Qt build system +# ---------------------------------------------------------------------------- + +examples/*/*/* +!examples/*/*/*[.]* +!examples/*/*/README +examples/*/*/*[.]app +!examples/declarative/* +!examples/tutorials/* +!examples/tutorials/*/* +!examples/ja_JP/*/* +demos/*/* +!demos/spectrum/* +demos/spectrum/bin +!demos/*/*[.]* +demos/*/*[.]app +!demos/declarative/* +config.tests/*/*/* +!config.tests/*/*/*[.]* +config.tests/*/*/*[.]app + +callgrind.out.* +pcviewer.cfg +*~ +*.a +*.la +*.core +*.moc +*.o +*.obj +*.orig +*.swp +*.rej +*.so +*.pbxuser +*.mode1 +*.mode1v3 +*_pch.h.cpp +*_resource.rc +.#* +*.*# +core +.qmake.cache +.qmake.vars +*.prl +tags +.DS_Store +*.debug +Makefile* +!qmake/Makefile.win32* +!qmake/Makefile.unix +*.prl +*.app +*.pro.user +*.qmlproject.user +*.gcov +bin/Qt*.dll +bin/assistant* +bin/designer* +bin/dumpcpp* +bin/idc* +bin/linguist* +bin/lrelease* +bin/lupdate* +bin/lconvert* +bin/moc* +bin/makeqpf* +bin/pixeltool* +bin/qmake* +bin/qdoc3* +bin/qt3to4* +bin/qtdemo* +bin/qttracereplay* +bin/rcc* +bin/uic* +bin/patternist* +bin/phonon* +bin/qcollectiongenerator* +bin/qdbus* +bin/qhelpconverter* +bin/qhelpgenerator* +bin/qtconfig* +bin/xmlpatterns* +bin/cetest* +bin/collectiongenerator +bin/helpconverter +bin/helpgenerator +bin/kmap2qmap* +bin/qlalr* +bin/qmlconv* +bin/qmldebugger* +bin/qml* +bin/qttracereplay* +configure.cache +config.status +mkspecs/default +mkspecs/qconfig.pri +moc_*.cpp +qmake/qmake.exe +qmake/Makefile.bak +src/corelib/global/qconfig.cpp +src/corelib/global/qconfig.h +src/corelib/global/qconfig.h.qmake +ui_*.h +tests/auto/qprocess/test*/*.exe +tests/auto/qtcpsocket/stressTest/*.exe +tests/auto/qprocess/fileWriterProcess/*.exe +tests/auto/qmake/testdata/quotedfilenames/*.exe +tests/auto/compilerwarnings/*.exe +tests/auto/qmake/testdata/quotedfilenames/test.cpp +tests/auto/qprocess/fileWriterProcess.txt +.com.apple.timemachine.supported +tests/auto/qlibrary/libmylib.so* +tests/auto/qresourceengine/runtime_resource.rcc +tools/qtestlib/chart/chart* +tools/qtestlib/updater/updater* +tools/activeqt/testcon/testcon.tlb +translations/*.qm +translations/*_untranslated.ts +qrc_*.cpp + +# Test generated files +QObject.log +tst_* +!tst_*.* +tst_*.log +tst_*.debug +tst_*~ + +# xemacs temporary files +*.flc + +# Vim temporary files +.*.swp + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.vcxproj +*.vcxproj.filters +*.vcxproj.user + +# MinGW generated files +*.Debug +*.Release + +# WebKit temp files +src/3rdparty/webkit/WebCore/mocinclude.tmp +src/3rdparty/webkit/includes.txt +src/3rdparty/webkit/includes2.txt + +# Symlinks generated by configure +tools/qvfb/qvfbhdr.h +tools/qvfb/qlock_p.h +tools/qvfb/qlock.cpp +tools/qvfb/qwssignalhandler.cpp +tools/qvfb/qwssignalhandler_p.h +.DS_Store +.pch +.rcc +*.app +config.status +config.tests/unix/cups/cups +config.tests/unix/getaddrinfo/getaddrinfo +config.tests/unix/getifaddrs/getifaddrs +config.tests/unix/iconv/iconv +config.tests/unix/ipv6/ipv6 +config.tests/unix/ipv6ifname/ipv6ifname +config.tests/unix/largefile/largefile +config.tests/unix/nis/nis +config.tests/unix/odbc/odbc +config.tests/unix/openssl/openssl +config.tests/unix/stl/stl +config.tests/unix/zlib/zlib +config.tests/unix/3dnow/3dnow +config.tests/unix/mmx/mmx +config.tests/unix/sse/sse +config.tests/unix/sse2/sse2 + + + +# Directories to ignore +# --------------------- + +debug +examples/tools/plugandpaint/plugins +include/* +include/*/* +lib/* +!lib/fonts +!lib/README +plugins/*/* +release +tmp +doc-build +doc/html/* +doc/qch +doc-build +.rcc +.pch +.metadata + +# Symbian build system generated files +# --------------------- + +ABLD.BAT +bld.inf* +*.mmp +*.mk +*.rss +*.loc +!s60main.rss +*.pkg +plugin_commonu.def +*.qtplugin +*.sis +*.sisx +*.lst +*.exe +*.mif +*.rsc +*.sym +*.lib + +# runonphone crash dumps +d_exc_*.txt +d_exc_*.stk + +# Generated by abldfast.bat from devtools. +.abldsteps.* + +# Carbide project files +# --------------------- +.project +.cproject +.make.cache +*.d + +qtc-debugging-helper +src/corelib/lib +src/network/lib +src/xml/lib/ + +.pc/ + +# INTEGRITY generated files +*.gpj +*.int +*.ael +*.dla +*.dnm +*.dep +*.map +work diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index eb41b932f2..a0220f2dc7 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -16,7 +16,7 @@ INSTALLS = sources target symbian:{ TARGET.EPOCALLOWDLLDATA = 1 TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo qmlminehuntfiles.files = MinehuntCore minehunt.qml DEPLOYMENT += qmlminehuntfiles } diff --git a/demos/embedded/qmlcalculator/qmlcalculator.pro b/demos/embedded/qmlcalculator/qmlcalculator.pro index 1e71eed4fa..4a82d32227 100644 --- a/demos/embedded/qmlcalculator/qmlcalculator.pro +++ b/demos/embedded/qmlcalculator/qmlcalculator.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlcalculator_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 LIBS += -lcone -leikcore -lavkon # Screen orientation } diff --git a/demos/embedded/qmlclocks/qmlclocks.pro b/demos/embedded/qmlclocks/qmlclocks.pro index 5edfe14241..cc97a7394b 100644 --- a/demos/embedded/qmlclocks/qmlclocks.pro +++ b/demos/embedded/qmlclocks/qmlclocks.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlclocks_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 LIBS += -lcone -leikcore -lavkon # Screen orientation } diff --git a/demos/embedded/qmldialcontrol/qmldialcontrol.pro b/demos/embedded/qmldialcontrol/qmldialcontrol.pro index 193cf55ce8..348c41a85d 100644 --- a/demos/embedded/qmldialcontrol/qmldialcontrol.pro +++ b/demos/embedded/qmldialcontrol/qmldialcontrol.pro @@ -6,6 +6,6 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmldialcontrol_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/qmleasing/qmleasing.pro b/demos/embedded/qmleasing/qmleasing.pro index 084a880cbe..9d7c8d7d00 100644 --- a/demos/embedded/qmleasing/qmleasing.pro +++ b/demos/embedded/qmleasing/qmleasing.pro @@ -6,6 +6,6 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmleasing_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/qmlflickr/qmlflickr.pro b/demos/embedded/qmlflickr/qmlflickr.pro index 8d4e03205c..a70a6df894 100644 --- a/demos/embedded/qmlflickr/qmlflickr.pro +++ b/demos/embedded/qmlflickr/qmlflickr.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlflickr_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices # Maximum heap size set to 128 MB in order to allow loading large images. TARGET.EPOCHEAPSIZE = 0x20000 0x8000000 diff --git a/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro b/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro index a4234cf0e8..ce6ff552cb 100644 --- a/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro +++ b/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlphotoviewer_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/qmltwitter/qmltwitter.pro b/demos/embedded/qmltwitter/qmltwitter.pro index 7bd4617b6b..197afd3431 100644 --- a/demos/embedded/qmltwitter/qmltwitter.pro +++ b/demos/embedded/qmltwitter/qmltwitter.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmltwitter_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index ad35fc9495..034ef2f2eb 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -19,7 +19,7 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarati INSTALLS = sources ImageProviderCore_sources target symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index c82c5eef4a..6d774abfdb 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -24,6 +24,6 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nok INSTALLS += qdeclarativesources sources target symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 } diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 2302946a53..2c74c05bb4 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -14,7 +14,7 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins INSTALLS += sources target symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 importFiles.files = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 1ffbf29925..f055c1b5ba 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -15,6 +15,6 @@ SOURCES += piechart.cpp \ chartsplugin.cpp symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 } diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri new file mode 100644 index 0000000000..d4dfecd365 --- /dev/null +++ b/modules/qt_declarative.pri @@ -0,0 +1,17 @@ +QT_DECLARATIVE_VERSION = $$QT_VERSION +QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_DECLARATIVE_MINOR_VERSION = $$QT_MINOR_VERSION +QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.declarative.name = QtDeclarative +QT.declarative.bins = $$QT_MODULE_BIN_BASE +QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative +QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private +QT.declarative.sources = $$QT_MODULE_BASE/src/declarative +QT.declarative.libs = $$QT_MODULE_LIB_BASE +QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE +QT.declarative.imports = $$QT_MODULE_IMPORT_BASE +QT.declarative.depends = gui script network +QT.declarative.DEFINES = QT_DECLARATIVE_LIB + +QT_CONFIG += declarative diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 8c59ee6f74..8a0ae71919 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,3 +1,5 @@ +load(qt_module) + TARGET = QtDeclarative QPRO_PWD = $$PWD QT = core gui script network @@ -13,7 +15,7 @@ exists("qdeclarative_enable_gcov") { LIBS += -lgcov } -include(../qbase.pri) +include($$QT_SOURCE_TREE/src/qbase.pri) #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET #DESTDIR=. @@ -41,5 +43,5 @@ symbian: { linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND DEFINES += QT_NO_OPENTYPE -INCLUDEPATH += ../3rdparty/harfbuzz/src +INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 44764a91a2..e55a5b2a29 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -7,7 +7,7 @@ QT += declarative script SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp HEADERS += qdeclarativefolderlistmodel.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index ad872bae3f..8ebf9a02f8 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -7,7 +7,7 @@ QT += declarative SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 4627956d8c..c04e640ba6 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -103,7 +103,7 @@ OTHER_FILES += \ RESOURCES += \ spriteparticles.qrc -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 0f70030dac..8647f05cb9 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -1,4 +1,6 @@ -symbian:include(../plugins/qpluginbase.pri) +load(qt_module) + +symbian:include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) TEMPLATE = lib CONFIG += qt plugin @@ -13,7 +15,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir +copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} @@ -25,7 +27,7 @@ QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -include(../qt_targets.pri) +include($$QT_SOURCE_TREE/src/qt_targets.pri) wince*:LIBS += $$QMAKE_LIBS_GUI diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index e8ab962da8..14113fb072 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,9 +1,9 @@ TARGET = qmldbg_tcp QT += declarative network -include(../../qpluginbase.pri) +include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling +DESTDIR = $$QT.declarative.plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" SOURCES += \ diff --git a/sync.profile b/sync.profile new file mode 100644 index 0000000000..77da8d8003 --- /dev/null +++ b/sync.profile @@ -0,0 +1,15 @@ +%modules = ( # path to module name map + "QtDeclarative" => "$basedir/src/declarative", +); +%moduleheaders = ( # restrict the module headers to those found in relative path +); +%classnames = ( +); +%mastercontent = ( + "gui" => "#include <QtGui/QtGui>\n", + "script" => "#include <QtScript/QtScript>\n", + "network" => "#include <QtNetwork/QtNetwork>\n", +); +%modulepris = ( + "QtDeclarative" => "$basedir/modules/qt_declarative.pri", +); diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index f2173f0c90..1edeaaa956 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -2,3 +2,4 @@ TEMPLATE=subdirs SUBDIRS=\ declarative \ +!cross_compile: SUBDIRS += host.pro diff --git a/tests/auto/compilerwarnings/data/test_cpp.txt b/tests/auto/compilerwarnings/data/test_cpp.txt new file mode 100644 index 0000000000..a3d65dbbea --- /dev/null +++ b/tests/auto/compilerwarnings/data/test_cpp.txt @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT_NO_DECLARATIVE +#include <QtDeclarative/QtDeclarative> +#endif + +#ifndef Q_OS_MAC +int main(int, char **) +{ + return 0; +} +#endif diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index dafc146610..fa632f031b 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle SOURCES += tst_examples.cpp -include(../../../../tools/qml/qml.pri) +include(../../../../tools/qmlviewer/qml.pri) include(../symbianlibs.pri) diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro index 6ef2432b5b..cbc5e18181 100644 --- a/tests/auto/declarative/parserstress/parserstress.pro +++ b/tests/auto/declarative/parserstress/parserstress.pro @@ -4,12 +4,17 @@ macx:CONFIG -= app_bundle SOURCES += tst_parserstress.cpp -symbian: { - importFiles.files = ..\\..\\qscriptjstestsuite\\tests - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" +!isEmpty(QT.script.sources) { + symbian: { + importFiles.files = $$QT.script.sources\\..\\..\\tests\\auto\\qscriptjstestsuite\\tests + importFiles.path = . + DEPLOYMENT += importFiles + DEFINES += TESTDATADIR=tests + DEFINES += SRCDIR=. + } else { + DEFINES += TESTDATADIR=\\\"$$QT.script.sources/../../tests/auto/qscriptjstestsuite/tests\\\" + DEFINES += SRCDIR=\\\"$$PWD\\\" + } } CONFIG += parallel_test diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp index c0a01df7c4..19ff25a814 100644 --- a/tests/auto/declarative/parserstress/tst_parserstress.cpp +++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp @@ -46,11 +46,6 @@ #include <QDir> #include <QFile> -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_parserstress : public QObject { Q_OBJECT @@ -91,25 +86,23 @@ QStringList tst_parserstress::findJSFiles(const QDir &d) void tst_parserstress::ecmascript_data() { -#ifdef Q_OS_SYMBIAN - QDir dir("tests"); -#else - QDir dir(SRCDIR); - dir.cdUp(); - dir.cdUp(); - dir.cd("qscriptjstestsuite"); - dir.cd("tests"); -#endif +#ifdef TESTDATADIR + QDir dir(TESTDATADIR); QStringList files = findJSFiles(dir); QTest::addColumn<QString>("file"); foreach (const QString &file, files) { QTest::newRow(qPrintable(file)) << file; } +#endif } void tst_parserstress::ecmascript() { +#ifndef TESTDATADIR + QSKIP("Needs QtScript sources", SkipAll); +#else + QFETCH(QString, file); QFile f(file); @@ -157,6 +150,7 @@ void tst_parserstress::ecmascript() QVERIFY(!component.isError()); } +#endif // ifdef TESTDATADIR } diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index 0d335a547d..bce758a5aa 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -1,6 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative -QT += sql script +QT += sql script webkit macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesqldatabase.cpp diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index 8d4b410567..46a3daec42 100644 --- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -2,7 +2,7 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle -include(../../../../tools/qml/qml.pri) +include(../../../../tools/qmlviewer/qml.pri) SOURCES += tst_qdeclarativeviewer.cpp diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro new file mode 100644 index 0000000000..54ea66a51d --- /dev/null +++ b/tests/auto/headersclean/headersclean.pro @@ -0,0 +1,5 @@ +load(qttest_p4) +SOURCES += tst_headersclean.cpp +QT = core + +contains(QT_CONFIG,declarative): QT += declarative diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp new file mode 100644 index 0000000000..68bc9d71a3 --- /dev/null +++ b/tests/auto/headersclean/tst_headersclean.cpp @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#define QT_NO_KEYWORDS +#define signals int +#define slots int +#define emit public:; +#define foreach public:; +#define forever public:; + +#include <QtCore/QtCore> +#include <QtTest/QtTest> + +#include <QtDeclarative/QtDeclarative> + +class tst_HeadersClean: public QObject +{ + Q_OBJECT +public: + tst_HeadersClean() {} +}; + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" diff --git a/tests/auto/host.pro b/tests/auto/host.pro new file mode 100644 index 0000000000..6bc8753fb0 --- /dev/null +++ b/tests/auto/host.pro @@ -0,0 +1,4 @@ +TEMPLATE=subdirs +SUBDIRS=\ + headersclean \ + diff --git a/tests/global/global.cfg b/tests/global/global.cfg new file mode 100644 index 0000000000..80e064a74f --- /dev/null +++ b/tests/global/global.cfg @@ -0,0 +1,5 @@ +<config> +<modules> +<module name="QtDeclarative" qtname="declarative"/> +</modules> +</config> diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index 84ebba828b..a185bdc9b4 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -34,7 +34,7 @@ maemo5 { } symbian { TARGET.UID3 = 0x20021317 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 TARGET.CAPABILITY = NetworkServices ReadUserData |