diff options
26 files changed, 73 insertions, 31 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index 6810f76..cb1f2ef 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -105,6 +105,10 @@ SUBDIRS=\ qfilesystementry \ qabstractfileengine +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qfileinfo \ + qfilesystementry \ + symbian:SUBDIRS -= \ qtconcurrentfilter \ qtconcurrentiteratekernel \ diff --git a/tests/auto/dbus.pro b/tests/auto/dbus.pro index 31b46a3..7470bf8 100644 --- a/tests/auto/dbus.pro +++ b/tests/auto/dbus.pro @@ -17,3 +17,5 @@ SUBDIRS=\ qdbusthreading \ qdbusxmlparser \ +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qdbusmarshall \ diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 17f56f2..cde39c2 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -209,11 +209,26 @@ SUBDIRS=\ win32:SUBDIRS -= qtextpiecetable !contains(QT_CONFIG, private_tests): SUBDIRS -= \ - qgraphicssceneindex \ - qnetworkreply \ - qpathclipper \ - qstylesheetstyle \ - qtextpiecetable \ + qcolumnview \ + qgraphicsanchorlayout \ + qgraphicsanchorlayout1 \ + qgraphicsitem \ + qgraphicsscene \ + qgraphicssceneindex \ + qlistwidget \ + qmainwindow \ + qnetworkreply \ + qpathclipper \ + qpixmapcache \ + qsidebar \ + qstatictext \ + qstylesheetstyle \ + qtcpsocket \ + qtextlayout \ + qtextpiecetable \ + qtipc \ + qtoolbar \ + qtreeview \ symbian:SUBDIRS -= \ qsystemtrayicon \ diff --git a/tests/auto/network.pro b/tests/auto/network.pro index e4cecce..9eb358f 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -46,9 +46,15 @@ SUBDIRS=\ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qauthenticator \ + qhostinfo \ qhttpnetworkconnection \ qhttpnetworkreply \ + qhttpsocketengine \ + qnetworkreply \ platformsocketengine \ qsocketnotifier \ qsocks5socketengine \ + qsslsocket \ + qsslsocket_onDemandCertificates_member \ + qsslsocket_onDemandCertificates_static \ diff --git a/tests/auto/other.pro b/tests/auto/other.pro index 655d666..b50e169 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -60,5 +60,7 @@ symbian { # Following tests depends on private API !contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qcombobox \ qcssparser \ + qtextedit \ diff --git a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro index 9fef8e4..3193caa 100644 --- a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro +++ b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro @@ -1,4 +1,6 @@ TEMPLATE = subdirs SUBDIRS = test qsystemlock - +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + test \ + qsystemlock \ diff --git a/tests/auto/qtipc/qtipc.pro b/tests/auto/qtipc/qtipc.pro index 60037d2..fb32e51 100644 --- a/tests/auto/qtipc/qtipc.pro +++ b/tests/auto/qtipc/qtipc.pro @@ -4,3 +4,7 @@ SUBDIRS=\ qsharedmemory \ qsystemsemaphore \ +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + lackey \ + qsharedmemory \ + qsystemsemaphore \ diff --git a/tests/auto/script.pro b/tests/auto/script.pro index c4d0544..80d259d 100644 --- a/tests/auto/script.pro +++ b/tests/auto/script.pro @@ -16,3 +16,5 @@ SUBDIRS=\ qscriptvaluegenerated \ qscriptvalueiterator \ +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qscriptcontext \ diff --git a/tests/auto/xmlpatterns.pro b/tests/auto/xmlpatterns.pro index b9244d6..4940cc4 100644 --- a/tests/auto/xmlpatterns.pro +++ b/tests/auto/xmlpatterns.pro @@ -46,4 +46,5 @@ xmlpatternsxqts.depends = xmlpatternssdk xmlpatternssdk \ xmlpatternsxqts \ xmlpatternsxslts \ + xmlpatternsschemats \ diff --git a/tests/benchmarks/corelib/io/io.pro b/tests/benchmarks/corelib/io/io.pro index 97445d7..15ae0d2 100644 --- a/tests/benchmarks/corelib/io/io.pro +++ b/tests/benchmarks/corelib/io/io.pro @@ -3,7 +3,7 @@ SUBDIRS = \ qdir \ qdiriterator \ qfile \ - qfileinfo \ + #qfileinfo \ # FIXME: broken qiodevice \ qtemporaryfile diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp index 0d0251f..8b1dbe2 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp @@ -44,7 +44,6 @@ #ifdef Q_OS_WIN # include <windows.h> -# include <atlbase.h> #else # include <sys/stat.h> # include <sys/types.h> @@ -176,7 +175,9 @@ void tst_qdiriterator::posix() QString path(dirpath); QBENCHMARK { #ifdef Q_OS_WIN - count = posix_helper(path.utf16()); + wchar_t wPath[MAX_PATH]; + path.toWCharArray(wPath); + count = posix_helper(wPath); #else count = posix_helper(dirpath.constData()); #endif diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index 17d164d..a501b1b 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro @@ -7,8 +7,6 @@ INCLUDEPATH += . QT -= gui CONFIG += release -CONFIG += debug - SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp index 935bccd..ede398d 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp +++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp @@ -229,7 +229,7 @@ void QFileSystemIteratorPrivate::pushSubDirectory(const QByteArray &path) #ifdef Q_OS_WIN wchar_t szSearchPath[MAX_PATH]; - wcscpy(szSearchPath, QString(path).utf16()); + QString::fromAscii(path).toWCharArray(szSearchPath); wcscat(szSearchPath, L"\\*"); HANDLE dir = FindFirstFile(szSearchPath, &m_fileSearchResult); m_bFirstSearchResult = true; diff --git a/tests/benchmarks/corelib/io/qfile/main.cpp b/tests/benchmarks/corelib/io/qfile/main.cpp index 6211751..e22637a 100644 --- a/tests/benchmarks/corelib/io/qfile/main.cpp +++ b/tests/benchmarks/corelib/io/qfile/main.cpp @@ -51,7 +51,6 @@ #ifdef Q_OS_WIN # include <windows.h> -# include <atlbase.h> #endif #define BUFSIZE 1024*512 diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro index 5ecb94c..3f1272d 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro @@ -5,8 +5,6 @@ DEPENDPATH += . INCLUDEPATH += . CONFIG += release -#CONFIG += debug - SOURCES += tst_qtimer_vs_qmetaobject.cpp QT -= gui diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro index f3dd66a..59e0070 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro +++ b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro @@ -5,7 +5,5 @@ DEPENDPATH += . INCLUDEPATH += . CONFIG += release -#CONFIG += debug - SOURCES += tst_qvariant.cpp diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index ffdad12..eea5d87 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -12,7 +12,7 @@ CONFIG += release # Input SOURCES += main.cpp -include( $${QT_SOURCE_TREE}/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri ) +include( $${QT_SOURCE_TREE}/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri ) exists( /usr/include/boost/regex.hpp ){ DEFINES+=HAVE_BOOST diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index daefe12..943302c 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -58,6 +58,11 @@ #include <unistd.h> #endif +// MAP_ANON is deprecated on Linux, and MAP_ANONYMOUS is not present on Mac +#ifndef MAP_ANONYMOUS +# define MAP_ANONYMOUS MAP_ANON +#endif + #include <private/qsimd_p.h> #include "data.h" @@ -789,7 +794,7 @@ static void __attribute__((noinline)) equals2_selftest() void *page1, *page3; ushort *page2; page1 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - page2 = (ushort *)mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0); + page2 = (ushort *)mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); page3 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); Q_ASSERT(quintptr(page2) == quintptr(page1) + pagesize || quintptr(page2) == quintptr(page1) - pagesize); @@ -938,7 +943,7 @@ static inline int ucstrncmp_short_tail(const ushort *p1, const ushort *p2, int l return 0; } -static inline int bsf_nonzero(register long val) +static inline int bsf_nonzero(register int val) { int result; # ifdef Q_CC_GNU @@ -1346,7 +1351,7 @@ void tst_QString::ucstrncmp() const void *page1, *page3; ushort *page2; page1 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - page2 = (ushort *)mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0); + page2 = (ushort *)mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); page3 = mmap(0, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); Q_ASSERT(quintptr(page2) == quintptr(page1) + pagesize || quintptr(page2) == quintptr(page1) - pagesize); diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro index 06a5836..b4a4622 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro @@ -1,6 +1,5 @@ load(qttest_p4) TARGET = tst_bench_qstringlist -CONFIG -= debug CONFIG += release QT -= gui SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/tools.pro b/tests/benchmarks/corelib/tools/tools.pro index 83a9411..9ad3950 100644 --- a/tests/benchmarks/corelib/tools/tools.pro +++ b/tests/benchmarks/corelib/tools/tools.pro @@ -6,8 +6,10 @@ SUBDIRS = \ qline \ qlist \ qrect \ - qregexp \ + #qregexp \ # FIXME: broken qstring \ qstringbuilder \ qstringlist \ qvector + +!*g++*: SUBDIRS -= qstring diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro index 73e40b2..4534d81 100644 --- a/tests/benchmarks/declarative/declarative.pro +++ b/tests/benchmarks/declarative/declarative.pro @@ -12,4 +12,10 @@ SUBDIRS += \ contains(QT_CONFIG, opengl): SUBDIRS += painting qmlshadersplugin +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + creation \ + pointers \ + qdeclarativeimage \ + script \ + include(../trusted-benchmarks.pri) diff --git a/tests/benchmarks/gui/animation/qanimation/qanimation.pro b/tests/benchmarks/gui/animation/qanimation/qanimation.pro index 53a139a..e42a830 100644 --- a/tests/benchmarks/gui/animation/qanimation/qanimation.pro +++ b/tests/benchmarks/gui/animation/qanimation/qanimation.pro @@ -5,8 +5,6 @@ DEPENDPATH += . INCLUDEPATH += . CONFIG += release -#CONFIG += debug - SOURCES += main.cpp \ dummyobject.cpp \ diff --git a/tests/benchmarks/gui/graphicsview/graphicsview.pro b/tests/benchmarks/gui/graphicsview/graphicsview.pro index 1509466..cd7d88e 100644 --- a/tests/benchmarks/gui/graphicsview/graphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/graphicsview.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ - functional \ + #functional \ # FIXME: broken qgraphicsanchorlayout \ qgraphicsitem \ qgraphicslayout \ diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 3b690da..9497227 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -40,11 +40,8 @@ ****************************************************************************/ #include <qtest.h> +#include <QtGui> #include <QDebug> -#include <QGraphicsItem> -#include <QGraphicsScene> -#include <QGraphicsView> -#include <QImage> #include "chiptester/chiptester.h" //#define CALLGRIND_DEBUG diff --git a/tests/benchmarks/gui/kernel/qapplication/main.cpp b/tests/benchmarks/gui/kernel/qapplication/main.cpp index 6399168..6231980 100644 --- a/tests/benchmarks/gui/kernel/qapplication/main.cpp +++ b/tests/benchmarks/gui/kernel/qapplication/main.cpp @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QApplication> +#include <QtGui> #include <qtest.h> diff --git a/tests/benchmarks/network/kernel/kernel.pro b/tests/benchmarks/network/kernel/kernel.pro index 1ec3071..13345a5 100644 --- a/tests/benchmarks/network/kernel/kernel.pro +++ b/tests/benchmarks/network/kernel/kernel.pro @@ -1,3 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ qhostinfo + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qhostinfo |