From 02f161410dce9e2bac89f11d293f811bb224257c Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 25 Sep 2009 14:35:34 +0300 Subject: Made QDir::tempPath and QDesktopServices::TempLocation consistent in S60 Reviewed-by: TrustMe Autotest: Fixes qdesktopservices::storageLocation test --- src/gui/util/qdesktopservices_s60.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp index b78e51b..fd06cf3 100644 --- a/src/gui/util/qdesktopservices_s60.cpp +++ b/src/gui/util/qdesktopservices_s60.cpp @@ -70,7 +70,6 @@ QT_BEGIN_NAMESPACE _LIT(KCacheSubDir, "Cache\\"); _LIT(KSysBin, "\\Sys\\Bin\\"); -_LIT(KTempDir, "\\System\\Temp\\"); _LIT(KBrowserPrefix, "4 " ); _LIT(KFontsDir, "z:\\resource\\Fonts\\"); const TUid KUidBrowser = { 0x10008D39 }; @@ -381,9 +380,7 @@ QString QDesktopServices::storageLocation(StandardLocation type) #endif break; case TempLocation: - path.Append(writableExeDrive().Name()); - path.Append(KTempDir); - //return QDir::tempPath(); break; + return QDir::tempPath(); break; case HomeLocation: path.Append(writableDataRoot()); -- cgit v0.12 From 5897e2b3eb54eee3b04c9d949890e254e20152d4 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 25 Sep 2009 13:52:22 +0200 Subject: Doc: Point out that not all DBMS'es can be expected to function equally well. In particular, MSSQL, DB2 and Sybase suffer from cross-platform and feature complete client libraries. --- doc/src/sql-programming/sql-driver.qdoc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/src/sql-programming/sql-driver.qdoc b/doc/src/sql-programming/sql-driver.qdoc index ea11bfb..84aea6c 100644 --- a/doc/src/sql-programming/sql-driver.qdoc +++ b/doc/src/sql-programming/sql-driver.qdoc @@ -77,6 +77,12 @@ \row \o \link #QTDS QTDS\endlink \o Sybase Adaptive Server \endtable + SQLite is the in-process database system with the best test coverage + and support on all platforms. Oracle via OCI, and PostreSQL and MySQL + through either ODBC or a native driver are well-tested on Windows and + Linux. The completeness of the support for other systems depends on the + availability and quality of client libraries. + \bold{Note:} To build a driver plugin you need to have the appropriate client library for your Database Management System (DBMS). This provides access to the API exposed by the DBMS, and is typically shipped with it. @@ -445,7 +451,7 @@ Sybase client library. Refer to the Sybase documentation for information on how to set up a Sybase client configuration file to enable connections to databases on non-default ports. - \section3 How to Build the QDTS Plugin on Unix and Mac OS X + \section3 How to Build the QTDS Plugin on Unix and Mac OS X Under Unix, two libraries are available which support the TDS protocol: @@ -609,7 +615,8 @@ The Qt InterBase plugin makes it possible to access the InterBase and Firebird databases. InterBase can either be used as a client/server or without a server in which case it operates on local files. The - database file must exist before a connection can be established. + database file must exist before a connection can be established. Firebird + must be used with a server configuration. Note that InterBase requires you to specify the full path to the database file, no matter whether it is stored locally or on another -- cgit v0.12 From 5b6799dffbd8ffc0c5943bf7dc35c945db0ae5ec Mon Sep 17 00:00:00 2001 From: mread Date: Fri, 25 Sep 2009 12:48:21 +0100 Subject: tst_qfilesystemwatcher directory changed test relaxed The polling watcher was generating two events for directory content deletion on Symbian emulator. 1 for content change, 1 for time change. Seems within the bounds of reason for a poller, so test relaxed to allow it. Reviewed-by: Liang QI --- tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 32cbed3..88bf229 100644 --- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -515,7 +515,9 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory() timer.start(3000); eventLoop.exec(); QCOMPARE(fileChangedSpy.count(), 0); - QCOMPARE(dirChangedSpy.count(), 1); + // polling watcher has generated separate events for content and time change + // on Symbian emulator, so allow possibility of 2 events + QVERIFY(dirChangedSpy.count() == 1 || dirChangedSpy.count() == 2); QVERIFY(QDir().rmdir("testDir")); } -- cgit v0.12 From f4cbcefc738b6cb8d6676907733f92e06ae33f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 25 Sep 2009 13:56:56 +0200 Subject: browser: Don't add closed tabs to the closed-tab history in privacy mode Task-number: QTBUG-4508 Reviewed-by: Simon Hausmann --- demos/browser/tabwidget.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp index f2f1b32..8a7ae0b 100644 --- a/demos/browser/tabwidget.cpp +++ b/demos/browser/tabwidget.cpp @@ -560,10 +560,13 @@ void TabWidget::closeTab(int index) } hasFocus = tab->hasFocus(); - m_recentlyClosedTabsAction->setEnabled(true); - m_recentlyClosedTabs.prepend(tab->url()); - if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize) - m_recentlyClosedTabs.removeLast(); + QWebSettings *globalSettings = QWebSettings::globalSettings(); + if (!globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) { + m_recentlyClosedTabsAction->setEnabled(true); + m_recentlyClosedTabs.prepend(tab->url()); + if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize) + m_recentlyClosedTabs.removeLast(); + } } QWidget *lineEdit = m_lineEdits->widget(index); m_lineEdits->removeWidget(lineEdit); -- cgit v0.12 From fcee72bcff0f7ebda01f990d772e27f4ab6ea73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 25 Sep 2009 14:02:40 +0200 Subject: doc: Update browser demo screenshot --- doc/src/images/browser-demo.png | Bin 157205 -> 144715 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/src/images/browser-demo.png b/doc/src/images/browser-demo.png index 466f218..5e0c0be 100644 Binary files a/doc/src/images/browser-demo.png and b/doc/src/images/browser-demo.png differ -- cgit v0.12 From 7c663d00eeea346813bb7ebcc36ac042b03e7688 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 25 Sep 2009 14:10:30 +0200 Subject: Doc: Document that iterators become invalid when the container is modified. Implicit sharing makes this a bit of a trap, since the iterator continues to function, but only on the data in the copies. --- doc/src/frameworks-technologies/containers.qdoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc index d29ca0e..0ac9732 100644 --- a/doc/src/frameworks-technologies/containers.qdoc +++ b/doc/src/frameworks-technologies/containers.qdoc @@ -267,7 +267,10 @@ Iterators provide a uniform means to access items in a container. Qt's container classes provide two types of iterators: Java-style - iterators and STL-style iterators. + iterators and STL-style iterators. Iterators of both types are + invalidated when the data in the container is modified or detached + from \l{Implicit Sharing}{implicitly shared copies} due to a call + to a non-const member function. \section2 Java-Style Iterators -- cgit v0.12 From a39f17108e43e8b676738c15d8f0c150787de514 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 25 Sep 2009 14:28:53 +0200 Subject: Move selfsigned cert & key out of root directory Moved the certificate/key to the src/s60installs path. Updated createpackage.pl to look in this new location. Task-number: QTBUG-4553 Reviewed-by: axis --- bin/createpackage.pl | 6 +++--- selfsigned.cer | 19 ------------------- selfsigned.key | 12 ------------ src/s60installs/selfsigned.cer | 19 +++++++++++++++++++ src/s60installs/selfsigned.key | 12 ++++++++++++ 5 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 selfsigned.cer delete mode 100644 selfsigned.key create mode 100644 src/s60installs/selfsigned.cer create mode 100644 src/s60installs/selfsigned.key diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 4597b04..7e87758 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -146,9 +146,9 @@ my $signed_sis_name = $pkgoutputbasename.".sis"; my $scriptpath = dirname(__FILE__); my $certtext = $certificate; my $certpath = $scriptpath; -$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash -$certpath = $certpath."../"; # certificates are one step up in hierarcy -$certpath =~ s-/-\\-go; # for those working with UNIX shells +$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash +$certpath =~ s-/-\\-go; # for those working with UNIX shells +$certpath =~ s-bin\\$-src\\s60installs\\-; # certificates are one step up in hierarcy # Check some pre-conditions and print error messages if needed unless (length($templatepkg) && length($platform) && length($target)) { diff --git a/selfsigned.cer b/selfsigned.cer deleted file mode 100644 index af72449..0000000 --- a/selfsigned.cer +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDFTCCAtOgAwIBAgIBADALBgcqhkjOOAQDBQAwcDELMAkGA1UEBhMCTk8xDjAM -BgNVBAoTBU5va2lhMRQwEgYDVQQLEwtRdCBTb2Z0d2FyZTEOMAwGA1UEAxMFVHJv -bGwxKzApBgkqhkiG9w0BCQEWHHF0czYwLWZlZWRiYWNrQHRyb2xsdGVjaC5jb20w -HhcNMDgxMDAzMTMwNDM1WhcNMDkxMDAzMTMwNDM1WjBwMQswCQYDVQQGEwJOTzEO -MAwGA1UEChMFTm9raWExFDASBgNVBAsTC1F0IFNvZnR3YXJlMQ4wDAYDVQQDEwVU -cm9sbDErMCkGCSqGSIb3DQEJARYccXRzNjAtZmVlZGJhY2tAdHJvbGx0ZWNoLmNv -bTCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQC7OyI3lyV06OqahpbeEa5p9ucmoBxV -n6YKvBjliPNMhQe7Di1Igv63rllQPqABv1Qu1YJc5CPiF4dSSQ/R7XjKEQqPZY4A -PZooTKWVCs+e3Yo2HWaZYRks/euvcqvEOqmkZ2RUccaTb1T+b2et0vphFmlVYXPx -BrIlbKtgJg+6QwIVAJnqTjBmWtEYQ6kFWfLE3yFIKx0BAoGAais4n6lD7yFJHB2F -mb4W09EPx+LZTFSHgj9uzLiWWDEVl+j9jA4eYZBMb2yRBZ9zVXqjDSrFLWMuoNrV -taqAVb9V2DrDHx3s0gSQmS5BNK2KThZCNOgj3YT4GRIZR4L6gqDBS5dkWLrwFUfC -l6Hw9tizQR4EO4HgjEnMSxzXDzsDgYQAAoGAJH/tVAEb1boQKTt5eHRI/zCtw4ab -Vtw7jHMzqQ+m921izJyzz5AJCVjtu6a1bLnW09i9oFIZ7bYs+Cd+qRgac2cVkX4x -xmMXuAgw03VMf3vEbK2M2+BkjpUGrfoST5XG/eJbno6Tp1BGvYd88ZLt3gXBPnqi -2QpMaOGqMED4mWkwCwYHKoZIzjgEAwUAAy8AMCwCFGCSlB1FYaBiIAuirrAACZzi -p2jnAhQ/hlJjpxOgF7Z5RZCNAhz6HNhZ3g== ------END CERTIFICATE----- diff --git a/selfsigned.key b/selfsigned.key deleted file mode 100644 index 47c51a0..0000000 --- a/selfsigned.key +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBugIBAAKBgQC7OyI3lyV06OqahpbeEa5p9ucmoBxVn6YKvBjliPNMhQe7Di1I -gv63rllQPqABv1Qu1YJc5CPiF4dSSQ/R7XjKEQqPZY4APZooTKWVCs+e3Yo2HWaZ -YRks/euvcqvEOqmkZ2RUccaTb1T+b2et0vphFmlVYXPxBrIlbKtgJg+6QwIVAJnq -TjBmWtEYQ6kFWfLE3yFIKx0BAoGAais4n6lD7yFJHB2Fmb4W09EPx+LZTFSHgj9u -zLiWWDEVl+j9jA4eYZBMb2yRBZ9zVXqjDSrFLWMuoNrVtaqAVb9V2DrDHx3s0gSQ -mS5BNK2KThZCNOgj3YT4GRIZR4L6gqDBS5dkWLrwFUfCl6Hw9tizQR4EO4HgjEnM -SxzXDzsCgYAkf+1UARvVuhApO3l4dEj/MK3DhptW3DuMczOpD6b3bWLMnLPPkAkJ -WO27prVsudbT2L2gUhnttiz4J36pGBpzZxWRfjHGYxe4CDDTdUx/e8RsrYzb4GSO -lQat+hJPlcb94luejpOnUEa9h3zxku3eBcE+eqLZCkxo4aowQPiZaQIUV0KZx9KH -Qp9/xwskqgJvmWgR8KQ= ------END DSA PRIVATE KEY----- diff --git a/src/s60installs/selfsigned.cer b/src/s60installs/selfsigned.cer new file mode 100644 index 0000000..af72449 --- /dev/null +++ b/src/s60installs/selfsigned.cer @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDFTCCAtOgAwIBAgIBADALBgcqhkjOOAQDBQAwcDELMAkGA1UEBhMCTk8xDjAM +BgNVBAoTBU5va2lhMRQwEgYDVQQLEwtRdCBTb2Z0d2FyZTEOMAwGA1UEAxMFVHJv +bGwxKzApBgkqhkiG9w0BCQEWHHF0czYwLWZlZWRiYWNrQHRyb2xsdGVjaC5jb20w +HhcNMDgxMDAzMTMwNDM1WhcNMDkxMDAzMTMwNDM1WjBwMQswCQYDVQQGEwJOTzEO +MAwGA1UEChMFTm9raWExFDASBgNVBAsTC1F0IFNvZnR3YXJlMQ4wDAYDVQQDEwVU +cm9sbDErMCkGCSqGSIb3DQEJARYccXRzNjAtZmVlZGJhY2tAdHJvbGx0ZWNoLmNv +bTCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQC7OyI3lyV06OqahpbeEa5p9ucmoBxV +n6YKvBjliPNMhQe7Di1Igv63rllQPqABv1Qu1YJc5CPiF4dSSQ/R7XjKEQqPZY4A +PZooTKWVCs+e3Yo2HWaZYRks/euvcqvEOqmkZ2RUccaTb1T+b2et0vphFmlVYXPx +BrIlbKtgJg+6QwIVAJnqTjBmWtEYQ6kFWfLE3yFIKx0BAoGAais4n6lD7yFJHB2F +mb4W09EPx+LZTFSHgj9uzLiWWDEVl+j9jA4eYZBMb2yRBZ9zVXqjDSrFLWMuoNrV +taqAVb9V2DrDHx3s0gSQmS5BNK2KThZCNOgj3YT4GRIZR4L6gqDBS5dkWLrwFUfC +l6Hw9tizQR4EO4HgjEnMSxzXDzsDgYQAAoGAJH/tVAEb1boQKTt5eHRI/zCtw4ab +Vtw7jHMzqQ+m921izJyzz5AJCVjtu6a1bLnW09i9oFIZ7bYs+Cd+qRgac2cVkX4x +xmMXuAgw03VMf3vEbK2M2+BkjpUGrfoST5XG/eJbno6Tp1BGvYd88ZLt3gXBPnqi +2QpMaOGqMED4mWkwCwYHKoZIzjgEAwUAAy8AMCwCFGCSlB1FYaBiIAuirrAACZzi +p2jnAhQ/hlJjpxOgF7Z5RZCNAhz6HNhZ3g== +-----END CERTIFICATE----- diff --git a/src/s60installs/selfsigned.key b/src/s60installs/selfsigned.key new file mode 100644 index 0000000..47c51a0 --- /dev/null +++ b/src/s60installs/selfsigned.key @@ -0,0 +1,12 @@ +-----BEGIN DSA PRIVATE KEY----- +MIIBugIBAAKBgQC7OyI3lyV06OqahpbeEa5p9ucmoBxVn6YKvBjliPNMhQe7Di1I +gv63rllQPqABv1Qu1YJc5CPiF4dSSQ/R7XjKEQqPZY4APZooTKWVCs+e3Yo2HWaZ +YRks/euvcqvEOqmkZ2RUccaTb1T+b2et0vphFmlVYXPxBrIlbKtgJg+6QwIVAJnq +TjBmWtEYQ6kFWfLE3yFIKx0BAoGAais4n6lD7yFJHB2Fmb4W09EPx+LZTFSHgj9u +zLiWWDEVl+j9jA4eYZBMb2yRBZ9zVXqjDSrFLWMuoNrVtaqAVb9V2DrDHx3s0gSQ +mS5BNK2KThZCNOgj3YT4GRIZR4L6gqDBS5dkWLrwFUfCl6Hw9tizQR4EO4HgjEnM +SxzXDzsCgYAkf+1UARvVuhApO3l4dEj/MK3DhptW3DuMczOpD6b3bWLMnLPPkAkJ +WO27prVsudbT2L2gUhnttiz4J36pGBpzZxWRfjHGYxe4CDDTdUx/e8RsrYzb4GSO +lQat+hJPlcb94luejpOnUEa9h3zxku3eBcE+eqLZCkxo4aowQPiZaQIUV0KZx9KH +Qp9/xwskqgJvmWgR8KQ= +-----END DSA PRIVATE KEY----- -- cgit v0.12 From f63b210e677e59c5b28d6e7b8bfa0af290c75bcb Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 25 Sep 2009 14:30:11 +0200 Subject: Fixed crash with QPixmap::fill() when pixmap is painted to using opengl1 Reviewed-by: Samuel --- src/opengl/qpixmapdata_gl.cpp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 8cb6c8d..2331c6d 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -384,8 +384,20 @@ void QGLPixmapData::fill(const QColor &color) m_hasFillColor = true; m_fillColor = color; } else { - QImage image = fillImage(color); - fromImage(image, 0); + + if (m_source.isNull()) { + m_fillColor = color; + m_hasFillColor = true; + + } else if (m_source.depth() == 32) { + m_source.fill(PREMUL(color.rgba())); + + } else if (m_source.depth() == 1) { + if (color == Qt::color1) + m_source.fill(1); + else + m_source.fill(0); + } } } @@ -399,15 +411,11 @@ QImage QGLPixmapData::fillImage(const QColor &color) const QImage img; if (pixelType() == BitmapType) { img = QImage(w, h, QImage::Format_MonoLSB); - img.setNumColors(2); - img.setColor(0, QColor(Qt::color0).rgba()); - img.setColor(1, QColor(Qt::color1).rgba()); - int gray = qGray(color.rgba()); - if (qAbs(255 - gray) < gray) - img.fill(0); - else + if (color == Qt::color1) img.fill(1); + else + img.fill(0); } else { img = QImage(w, h, m_hasAlpha -- cgit v0.12 From 789232278180296b04b7178a95a2e0394eb6736c Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 25 Sep 2009 15:34:25 +0300 Subject: Clean-up for qprocess autotest since default stack in S60 is now 80K. Specialized test code to set higher stack for this test case is not needed anymore since default stack for Qt thread in S60 now is 80 KB. See commit: 9324fdde Reviewed-by: TrustMe --- tests/auto/qprocess/tst_qprocess.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index e759b0e..9e3bce0 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -1318,15 +1318,6 @@ protected slots: private: int exitCode; -#ifdef Q_OS_SYMBIAN - enum - { - /** - * The maximum stack size. - */ - SymbianStackSize = 0x14000 - }; -#endif }; //----------------------------------------------------------------------------- @@ -1334,9 +1325,6 @@ void tst_QProcess::processInAThread() { for (int i = 0; i < 10; ++i) { TestThread thread; -#if defined(Q_OS_SYMBIAN) - thread.setStackSize(SymbianStackSize); -#endif thread.start(); QVERIFY(thread.wait(10000)); QCOMPARE(thread.code(), 0); @@ -1359,10 +1347,6 @@ void tst_QProcess::processesInMultipleThreads() thread1.serial = serialCounter++; thread2.serial = serialCounter++; thread3.serial = serialCounter++; - - thread1.setStackSize(SymbianStackSize); - thread2.setStackSize(SymbianStackSize); - thread3.setStackSize(SymbianStackSize); #endif thread1.start(); thread2.start(); -- cgit v0.12 From c0cb9c68f598197c1d52c4b9d3445c6b5c49ed8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 25 Sep 2009 14:33:33 +0200 Subject: browser demo: Disable debug logging in release mode --- demos/browser/browser.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro index afc25e3..407030f 100644 --- a/demos/browser/browser.pro +++ b/demos/browser/browser.pro @@ -6,6 +6,8 @@ CONFIG += qt warn_on contains(QT_BUILD_PARTS, tools):!symbian:!embedded: CONFIG += uitools else: DEFINES += QT_NO_UITOOLS +release:DEFINES+=QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT + FORMS += \ addbookmarkdialog.ui \ bookmarks.ui \ -- cgit v0.12 From a8c50d490769f587b54a8a60f592a091e2f1e05b Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 25 Sep 2009 15:44:06 +0300 Subject: Skipped QProcess::setProcessEnvironment auto test for Symbian. Symbian OS doesn't support environment variables. Reviewed-by: Miikka Heikkinen --- tests/auto/qprocess/tst_qprocess.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index 9e3bce0..d5bc0bd 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -1868,8 +1868,10 @@ void tst_QProcess::setProcessEnvironment_data() void tst_QProcess::setProcessEnvironment() { -#if !defined (Q_OS_WINCE) - // there is no concept of system variables on Windows CE as there is no console +#if defined (Q_OS_WINCE) || defined(Q_OS_SYMBIAN) + QSKIP("OS doesn't support environment variables", SkipAll); +#endif + // make sure our environment variables are correct QVERIFY(qgetenv("tst_QProcess").isEmpty()); QVERIFY(!qgetenv("PATH").isEmpty()); @@ -1899,7 +1901,6 @@ void tst_QProcess::setProcessEnvironment() QCOMPARE(process.readAll(), value.toLocal8Bit()); } -#endif } //----------------------------------------------------------------------------- void tst_QProcess::systemEnvironment() -- cgit v0.12 From 4a7f44a97382e84c94cf453f6129b7d38d696dd6 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 25 Sep 2009 15:58:16 +0300 Subject: Added "requires qtscript" to qsharedmemory test pro in S60 and WinCE. qsharedmemory autotest does not compile for S60 and WinCE without QtScript and QtScript currently does not compiled for S60, that's why the following statement was added: requires(contains(QT_CONFIG,script)) Reviewed-by: TrustMe --- tests/auto/qsharedmemory/lackey/lackey.pro | 2 ++ tests/auto/qsharedmemory/test/test.pro | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/auto/qsharedmemory/lackey/lackey.pro b/tests/auto/qsharedmemory/lackey/lackey.pro index 9d2fcad..d25a50a 100644 --- a/tests/auto/qsharedmemory/lackey/lackey.pro +++ b/tests/auto/qsharedmemory/lackey/lackey.pro @@ -9,6 +9,8 @@ DESTDIR = ./ win32: CONFIG += console mac:CONFIG -= app_bundle +requires(contains(QT_CONFIG,script)) + DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG diff --git a/tests/auto/qsharedmemory/test/test.pro b/tests/auto/qsharedmemory/test/test.pro index 779a942..c9f4fec 100644 --- a/tests/auto/qsharedmemory/test/test.pro +++ b/tests/auto/qsharedmemory/test/test.pro @@ -18,12 +18,14 @@ TARGET = ../tst_qsharedmemory } wince*:{ +requires(contains(QT_CONFIG,script)) QT += gui script addFiles.sources = ../lackey/lackey.exe ../lackey/scripts addFiles.path = lackey DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\"\\\" }else:symbian*{ +requires(contains(QT_CONFIG,script)) QT += gui script addFiles.sources = ../lackey/scripts addFiles.path = /data/qsharedmemorytemp/lackey -- cgit v0.12 From f2fa66d3dd722d88c651738bef7b1ccb3c91c156 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 25 Sep 2009 16:05:22 +0300 Subject: Added "requires qtscript" to qsystemsemaphore test in S60 and WinCE. qsystemsemaphore autotest does not compile for S60 and WinCE without QtScript and QtScript currently does not compile for S60, that's why the following statement was added to pro file: requires(contains(QT_CONFIG,script)) Reviewed-by: TrustMe --- tests/auto/qsystemsemaphore/test/test.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qsystemsemaphore/test/test.pro b/tests/auto/qsystemsemaphore/test/test.pro index b8d3a4a..ed7898c 100644 --- a/tests/auto/qsystemsemaphore/test/test.pro +++ b/tests/auto/qsystemsemaphore/test/test.pro @@ -18,6 +18,7 @@ win32 { RESOURCES += ../files.qrc wince*: { +requires(contains(QT_CONFIG,script)) # this test calls lackey, which then again depends on QtScript. # let's add it here so that it gets deployed easily QT += script @@ -28,6 +29,7 @@ DEPLOYMENT += lackey } symbian: { +requires(contains(QT_CONFIG,script)) # this test calls lackey, which then again depends on QtScript. # let's add it here so that it gets deployed easily QT += script -- cgit v0.12