summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Print out the try_compile output for tests expected to fail.Stephen Kelly2012-02-211-0/+2
| | | | | | | | This way, ctest -V shows that it fails for the expected reason. Change-Id: I97589d4e90d889ea0b10dbd6192526712dbfdd8e Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* qmimetype: Fix test failure when LC_ALL is set.David Faure2012-02-211-0/+1
| | | | | | | | | | | | This code sets LANG=en_US so that the method comment(), which returns a translated name, can be compared with an expected result in English. (QMimeType::comment uses QLocale::system().name() and QLocale::system().uiLanguages()) But LANG= has no effect if LC_ALL is set, so LC_ALL needs to be cleared (or set to en_US) for the test to work. Change-Id: Icb031057769be9bc8c0fcab65daa45e7bf1d5b18 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Test for QT_NO_SSL instead of QT_NO_OPENSSLShane Kearns2012-02-2111-74/+74
| | | | | | | | Change the ifdefs in our own code (except openssl backend) to use the new configure flag. Change-Id: I8774734771c66b22164b5fae8fdb27814ac3df7b Reviewed-by: Richard J. Moore <rich@kde.org>
* Make qget manual test compile without ssl supportShane Kearns2012-02-212-0/+6
| | | | | Change-Id: I35f92328b79df1cfcae52fa6ff8290f260183aea Reviewed-by: Richard J. Moore <rich@kde.org>
* QEasingCurve: implement move constructorMarc Mutz2012-02-211-0/+6
| | | | | | | | | | | | | | | | | | | | | The move constructor sets other.d_ptr to zero. This is safe, because after being moved from, the object is left in a state in which it can be safely destroyed (delete nullptr is a no-op). It cannot meaningfully be used anymore (most members will crash with a nullptr dereference), but in most cases, the moved-from object cannot be accessed anyway (not a named object), and if a named object is moved from, it must have been through explicit std::move(), as in the test case. The STL makes better guarantees (moved-from containers are .empty()), but I don't think it's worth introducing a null state into QEasingCurve just for supporting a use-case that should be considered a bug anyway. Change-Id: I4115b7386cdea6960507da6843a0d0196d8e4139 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QEasingCurve: implement move-assignment operatorMarc Mutz2012-02-211-0/+19
| | | | | | | | Implemented as in QPen etc. Change-Id: I65b43c6ec7308ca4b44f614594c15c41ab2f89f9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QEasingCurve: add member-swapMarc Mutz2012-02-211-0/+7
| | | | | | | | Implementated as in QPen etc. Change-Id: Ia08551bf7902b60e115d1b1d2353030597e34841 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Port badxml autotest to QMetaObjectBuilderKent Hansen2012-02-212-16/+16
| | | | | | | | | | | | | | The meta-object format is going to change for Qt5. Use QMOB to insulate the badxml test from such changes. (It just so happens that the QFAIL("a failure") statement is still on line 109 after the refactoring, so the expected_badxml.* files' location tags did not have to be changed.) Change-Id: I04421d13c4df71c8004fa71cafc4823a59079a41 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove qMacVersion()Bradley T. Hughes2012-02-211-1/+1
| | | | | | | | Add QSysInfo::macVersion() instead, to match the windowsVersion() function. Change-Id: I783e59583ca21653d25586156cbb0cb1f301868b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix qlogging test.Friedemann Kleint2012-02-211-2/+3
| | | | | | | Build app sub-process first. Change-Id: I87a11f7fd5d8a82584e496722f79e236191b0fb3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Improve tst_QPrinterInfo::testForDefaultPrinter().Jason McDonald2012-02-211-1/+2
| | | | | | | Be explicit about skipping the test when no default printer is present. Change-Id: If69b275eb0f490411471ec42798d8aefcc57fd83 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Allow printer names to contain hyphens in QPrinterInfo test.Jason McDonald2012-02-211-1/+1
| | | | | Change-Id: I473627413d2f1cd5637704f2948eb07a264be49e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix warning about unregistered metatype in QWindow autotest.Jason McDonald2012-02-211-0/+2
| | | | | Change-Id: If9d8d7e1cd52815ef7231294e4890dfafcd28ec8 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Flag two tests (Win+A, Simon+G) in parseString as expect fail on OSX.Toby Tomkins2012-02-212-2/+5
| | | | | | | | | | | Remove previously defined insignificant test flag as the number of tests failing has been reduced. Task-number: QTBUG-24406 Task-number: QTBUG-23058 Change-Id: I01b41f30469cf7a440e21195e105cb30a8db76e2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make the QApplication autotest work for shadow builds.Jason McDonald2012-02-211-3/+22
| | | | | | | Use QFINDTESTDATA to locate the helper applications. Change-Id: I604d10e37c9367f2e95225864edf5bf705f1d961 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_qapplication: mark expected failure on macRohan McGovern2012-02-211-0/+11
| | | | | | | | | | The tab key behavior in Qt5 no longer respects the "Text boxes and lists only" tab navigation option in OSX, which is the default. This is a regression since Qt4. Task-number: QTBUG-24372 Change-Id: I54c1663f8fb259dd847083432102a0bfad7dd69c Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Changed qnetworksession unittest to work from installation dirKurt Korbatits2012-02-212-1/+6
| | | | | | | | - Made test depend on subprogram - added install of subprogram Change-Id: Ib263e9e75ed3c900b52fb1c9b6d319e71d19bdbb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Stabilize tst_qdbusabstractinterface and make it XFAILRohan McGovern2012-02-201-40/+38
| | | | | | | | | | | | | | | This test was written incorrectly in a way which happened to allow it to pass most of the time (but not all the time). Reset the state of test objects between each test function, and mark the broken functions with QEXPECT_FAIL and a link to a task. Replace the unusual WaitForPinger construct with the usual QTRY_VERIFY/QTRY_COMPARE method of verifying asynchronous operations. Task-number: QTBUG-24262 Change-Id: I82d09002307c0b500bf60cd5b583674321b37609 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Silence warnings/debug output from qobject testsKent Hansen2012-02-201-0/+14
| | | | | | | | | They create noise in the test results. Change-Id: I40e7239ba7cd41bec577fe8220c86476553a6502 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove QPlatformIntegration/QPlatformTheme from QGuiAppPrivate.Friedemann Kleint2012-02-201-0/+1
| | | | | | | Forward-declare instead. Change-Id: I3851994e8bc05b389e94e948478339ba33d521c1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix warning about converting false to pointer value.Friedemann Kleint2012-02-201-2/+2
| | | | | | Change-Id: I70c324e6fcfd2bba3ab44837c5ce2c007de8896f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* uic: use QStringLiteral() instead of QString::fromUtf8() where applicableMarc Mutz2012-02-2099-1500/+1500
| | | | | | | | | | | | | | | | | | | | | | | Many (most?) strings written aren't in fact UTF-8, and we can check at compile-time which are and which aren't, so don't hard-code fromUtf8() but use the much more efficient QStringLiteral() where applicable. This is low-hanging fruit. This patch only optimises US-ASCII string literals, not those that are latin-1 or even UTF-8, because that would require more extensive changes to the original fixString() function. Likewise, there are also other calls to QString::fromUtf8() being generated (e.g. in the pixmap code) that could benefit from being turned into QStringLiterals, but their code paths are more involved than those this patch fixes. This patch at least suffices in turning all the setObjectName() arguments into QStringLiterals, which was the main goal. The autotest baseline has been updated with the new expected results. Change-Id: Ic1ef67f500f9ff92d36164d515f4e004ef2a10bc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add QMetaMethod::isValid() functionKent Hansen2012-02-201-0/+15
| | | | | | | | | | | | This function provides a proper way of determining whether a function returned by QMetaObject::method() is valid. (Checking whether signature() returns a 0 pointer, which e.g. testlib does, is not an ideal API -- especially given that signature() will soon be removed and replaced by a function that returns a QByteArray.) Change-Id: I644f476b09904925f2042945f5d0ad744482b682 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Changed qabstractnetworkcache unittest to use TESTDATAKurt Korbatits2012-02-201-5/+1
| | | | | | | | - Changed qabstractnetworkcache to install testdata Change-Id: I8f2ae6103214755ee7898dbc0ee50c0e4d7d45ab Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Modify helper functions to remove embedded QSKIP call and return status.Toby Tomkins2012-02-201-8/+13
| | | | | | | | | The helper functions contained QSKIP macros which do not also skip their parent function. These QSKIP function were removed and replaced with a return success value. Change-Id: I533f57842fc95beaeb1fcde5235678e9807db056 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Set tst_qtoolbutton triggered function skipped.Toby Tomkins2012-02-201-0/+4
| | | | | | | | | | This autotest seems to be caught in an event loop preventing further correct signalling. Mark test function skipped with QSKIP. Task-number: QTBUG-24374 Change-Id: Ic943a33b71fa87d0873278cb7b7b134c22602be3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make QLocale autotest pass for shadow builds.Jason McDonald2012-02-201-7/+1
| | | | | | | | | | | | | | For shadow builds where "make install" had not been run, the tst_QLocale::emptyCtor test function would fail to find its helper application because QFINDTESTDATA was not searching for it in the build directory due to the test not instantiating QCoreApplication. This commit fixes the test by instantiating a QCoreApplication using the QTEST_MAIN macro, which also allows some special case code for Windows CE to be removed. Change-Id: Ic81d4699da2538c24b36b3d6bd52c4a02ad417f4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* testlib: Report one test result per benchmark test.Jason McDonald2012-02-2016-70/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, a benchmark test could report 0..n passes and 0..m fails or skips, where n is the number of accumulation iterations used to collect benchmark data and m is the number of times the test function was invoked. Depending on the type of benchmark measurer being used, this could result in a very large volume of test output and inconsistent pass, fail and skip counts between test runs. This commit changes the behaviour so that each benchmark test reports one pass, fail or skip, regardless of the number of iterations used to collect benchmark data. This commit also prevents benchmark data being reported in the test output if the benchmark test failed or skipped, as any benchmark data is of dubious value in such cases. The latter change in behaviour requires a minor modification to the badxml selftest, which now tests quoting of literal strings in xml test output for both passing and failing benchmarks. Finally, this commit also adds a new selftest specifically for verifying correct behaviour for benchmarks that fail or skip. Task-number: QTBUG-24313 Change-Id: I3426dc659a7511b62fd183a031c7235bc753f497 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed qobject unittest to work from installation directoryKurt Korbatits2012-02-202-2/+6
| | | | | | | | | | - Made test depend on subprogram to make sure it was there when test ran. - install signalbug subprogram Change-Id: Ie0a19e52d131adcd17c97b263389aecffb81520e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* testlib: Add selftests for XPASS and XFAIL involving QCOMPARE.Jason McDonald2012-02-205-59/+200
| | | | | Change-Id: I4f897b411aaa51ff453208eda50e12665489074b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* testlib: make XPASS output slightly less confusing.Jason McDonald2012-02-208-12/+12
| | | | | | | | | | | | | | Prior to this commit, when an unexpected pass occurred the test output showed the message "XPASS : tst_foo::function() 'expr' returned FALSE", where the problem was actually that the expression evaluated to true when it was expected to be false. This commit changes the output to make it clear that the expression evaluated to true unexpectedly. Task-number: QTBUG-22118 Change-Id: Id22c178073d3b75789675ca37a8ef019029b1f91 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Speed up tst_QWaitConditionBradley T. Hughes2012-02-201-7/+1
| | | | | | | | | Reduce the thread and iteration counts to make this test execute faster. This change reduces the runtime to 14 seconds (from 5 minutes, 38 seconds). Change-Id: Id5ea056cfd33022da5a06809f0598a5cdb02b27b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Import QMimeType / QMimeDatabase into QtCore.David Faure2012-02-1814-2/+1358
| | | | | | | | | | | | | | | | History of the development before the import: ssh://codereview.qt-project.org/playground/mimetypes.git Mimetype definitions come from shared-mime-info where available (UNIX systems), loaded using a mmap'ed binary cache generated by update-mime-database. As a fallback if no cache is found, we parse the raw XML files otherwise. This makes the MIME type support fast and with very low memory usage on UNIX, and it makes it easy to use on Windows (no dependency on shared-mime-info, Qt even includes a freedesktop.xml file to use if none are found on the system). Change-Id: I27b05008216ff936dc463bd80d3893422bfb940e Reviewed-by: Richard J. Moore <rich@kde.org>
* Added error reporting to QJsonParserAndrew Christian2012-02-181-0/+165
| | | | | Change-Id: Ib2390c0faf1ed7ada3fc185abce83740ad112929 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix qclipboard autotest on Windows.Friedemann Kleint2012-02-181-1/+0
| | | | | | | | | Emit changed signal only if the clipboard is not owned, in which case QClipboard does it. Task-number: QTBUG-24184 Change-Id: I27420583a718a5f8cd93b9d361b1e422a75df300 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Windows: Fix QWindow-test.Friedemann Kleint2012-02-171-1/+1
| | | | | | | | | | | | - Save & Restore style and geometry when switching to full screen and back since it is not a real state on Windows. - Obey the positioning policy in setGeometry. Task-number: QTBUG-24185 Change-Id: I18dea4fd372e0b2e46273a7a27e0c6f4f4bde771 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Ensure that Qt public headers compile with strict flagsDavid Faure2012-02-172-4/+28
| | | | | | | | | | Those from http://wiki.qt-project.org/Coding_Conventions#Conventions_for_public_header_files (unfortunatey -Wold-style-cast cannot be used due to the glibc macro bswap_16) and many Qt defines that disable casts. Change-Id: I97ac707a101df9819e8c031fa75a31b30e20247f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix handling of urls containing username/password in QNetworkAccessManagerShane Kearns2012-02-171-10/+53
| | | | | | | | | | | | | | | | | | QNetworkAccessManager was ignoring the supplied credentials, although webkit seems to support these urls at a higher level. Following the behaviour of browsers: We use supplied credentials if authentication is required. We add supplied credentials to the authentication cache. We emit authenticationRequired signal if the credentials were wrong. We do not use previously cached credentials for that url Synchronous http requests fail, if the credentials were wrong. Task-number: QTBUG-18107 Change-Id: If46e8eab1511ba8a0f4bbe0d4efaabc4df0b8ab4 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make 'nmake check' succeed for widgets testsMiikka Heikkinen2012-02-1710-0/+21
| | | | | | | | | | | | | Marked a bunch of tests insignificant, and skipped one crashing test case in QApplication test, as that couldn't be made to pass simply by marking the test insignificant. Once the underlying issues are fixed, the tests need to be re-enabled. Task-number: QTBUG-24203 Change-Id: I9aea4fa207d307793445efdcaead72219fbf6c4f Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Disable 'check' target generation for network autotests for Windows.Miikka Heikkinen2012-02-171-2/+2
| | | | | | | | | | A number of network autotests are unstable in Windows, so don't generate check target for them as is done for mac. Once the tests are acceptably stable, this needs to be reverted. Change-Id: I18262e28ce40eba541aecf3cfb651bff34698ead Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Expect failure in tst_QStyleSheetStyle::hoverColors()Bradley T. Hughes2012-02-171-0/+5
| | | | | | | | | This is similar to the focusColors() failures in QTBUG-23686. Task-number: QTBUG-23686 Change-Id: I1f01a4e41e61a7a664309be34cfa4fe916a92b15 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip tst_QGuiApplication::focusObject() on Mac OS XBradley T. Hughes2012-02-171-0/+3
| | | | | | | | | This test fails intermittently, and at random locations. Task-number: QTBUG-24322 Change-Id: Ied6dd4d1593066debc0fb48c6ca2a17a1f4d51b7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip all tst_QFontDialog tests on Mac OS XBradley T. Hughes2012-02-171-0/+10
| | | | | | | | | All of these tests currently hang. Task-number: QTBUG-24321 Change-Id: I7664b57f6539d4c03008701da66e193019a4440a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip hanging tst_QColorDialog test, expect failing test on Mac OS XBradley T. Hughes2012-02-171-0/+6
| | | | | | | | | | tst_QColorDialog::native_activeModalWidget() hangs, so skip this test. tst_QColorDialog::task247349_alpha() fails, so XFAIL this failure. Task-number: QTBUG-24320 Change-Id: Ie4d69e07063e9a648ec4fa3337274143a52ea3e3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip hanging/failing tst_QApplication tests on Mac OS XBradley T. Hughes2012-02-172-2/+6
| | | | | | | | | | | | | | The first block of tst_QApplication::quitOnLastWindowClosed() hangs on Mac OS X, so skip that block for now. tst_QApplication::testDeleteLAter() both hangs and fails on Mac OS X, so skip the test and XFAIL the failure. Task-number: QTBUG-24318 Task-number: QTBUG-24319 Change-Id: Ice11292d84e63215f1bb9e03f3ef369943d1d887 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Expect tst_QSettings::ctor(native) failures on Mac OS XBradley T. Hughes2012-02-172-1/+6
| | | | | | | | | | | | | | The default constructor for QSettings does not set NoAccess status, even if the organization domain, organization name, and application name are empty. Instead of trying to fix QSettings, keep the existing behavior, and test for it. Failures from tst_QSettings no longer need to be ignored, so mac:CONFIG+=insignificant_test has been removed from the .pro file. Task-number: QTBUG-22745 Change-Id: Ic9f8b6821c483c217e1ef2ece704be2da169e340 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add palette() and further hints to QtGui/QPlatformTheme.Friedemann Kleint2012-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | - Move palette() from deprecated QtWidgets/QGuiPlatformPlugin to QtGui/QPlatformTheme, Make it return a const * since QPalette does not have isNull(). - Initialize QGuiApplication::palette() and QApplication::systemPalette() from it. - Do not initialize QPalette from QGuiApplication::palette() unless app_pal is non-null (default to Qt::black if it is 0). This avoids initialization order crashes/recursions in the QPA plugin. Streamline initialization function. - Remove styleName(), systemIconThemeName() and iconSearchPaths() from QGuiPlatformPlugin and re-add them as QPlatformTheme::themeHint(). - Remove styleHint() from QGuiPlatformPlugin, add it to QPlatformTheme::themeHint(). - Add UNIX themes with factory function (Generic, KDE, Gnome), taking it from Qt 4.8 code (stripping the KDE 3 code). - Implement Windows palettes. Task-number: QTBUG-24204 Change-Id: Ie27ec035df4f84c42deaffc4816b2e53ce705462 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Changed qnetworkreply unittest to work from install directoryKurt Korbatits2012-02-174-289/+243
| | | | | | | | | | | | | | | | | - made subdir test depend on echo - remove SRCDIR and changed to use TESTDATA and QFINDTESTDATA - added waitForFinish() to handle slow networks - removed core module header from echo subprogram and replaced with needed header only - Added ipv6 skip to connectToIPV6Address() if not available - Added check QT_BUILD_INTERNAL and skip tests if backend not available - Skip permission tests if run as root - Removed win32 debug and release directory locations so that application is in known location relative to test data Change-Id: I58c3c2fca3cd2fee72fdb81d016bb4fd7fe08ac2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Removed rfc3252.txt from networkselftest unittestKurt Korbatits2012-02-172-910/+0
| | | | | | | | - no longer needed after test that used it was removed Change-Id: I63fc8a9db07f9250507becb9bf6c2aefe0fdc254 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove usages of QT_ARCH and QT_ARCH_* from qtbaseBradley T. Hughes2012-02-178-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The architecture is detected at compile time based on the predefined macros from the compiler. Don't use QT_ARCH in .pro, .pri, or .prf files. The PNG_NO_ASSEMBLER_CODE define from libpng.pri is not present in the current copy of src/3rdparty/libpng, so no change in functionality is expected. The conditional for the SUPPORT_JIT define in pcre.pri is moved to src/3rdparty/pcre/config.h, again so that we can use the compiler's predefined macros to detect the architecture at compile time. Replace QT_ARCH_ARM, QT_ARCH_MIPS, and QT_ARCH_SPARC with their Q_PROCESSOR_* equivalents. Replace QT_ARCH_INTEGRITY, QT_ARCH_VXWORKS, and QT_ARCH_WINDOWSCE with their Q_OS_* equivalents. Note that this commit also effectively disables the SPARC atomic implementation. An inline implementation for SPARC needs to be added, or we remove the current code and instead rely on the GCC intrinsic or C++11 std::atomic support on SPARC. Note also that this commit does not remove QT_ARCH from configure or qconfig.h. This will continue to be set until all Qt 5 projects can be moved away from using QT_ARCH. Change-Id: I5de747cc4436d21941329974cff3016970f497b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 05:02:11 +0000