mirror of
https://github.com/crystalidea/qt6windows7.git
synced 2025-07-08 02:17:43 +08:00
6.5.3 clean
This commit is contained in:
@ -10,7 +10,7 @@ if(APPLE)
|
||||
list(APPEND tst_qstring_extra_sources tst_qstring_mac.mm)
|
||||
endif()
|
||||
|
||||
foreach(test tst_qstring tst_qstring_restricted_ascii)
|
||||
foreach(test tst_qstring tst_qstring_restricted_ascii tst_qstring_no_cast_from_ascii)
|
||||
qt_internal_add_test(${test}
|
||||
SOURCES
|
||||
tst_qstring.cpp
|
||||
@ -28,3 +28,9 @@ qt_internal_extend_target(tst_qstring_restricted_ascii
|
||||
QT_RESTRICTED_CAST_FROM_ASCII
|
||||
tst_QString=tst_QString_restricted_ascii
|
||||
)
|
||||
|
||||
qt_internal_extend_target(tst_qstring_no_cast_from_ascii
|
||||
DEFINES
|
||||
QT_NO_CAST_FROM_ASCII
|
||||
tst_QString=tst_QString_no_cast_from_ascii
|
||||
)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -9,17 +9,20 @@
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
#include <Foundation/Foundation.h>
|
||||
|
||||
using namespace Qt::StringLiterals;
|
||||
|
||||
void tst_QString_macTypes()
|
||||
{
|
||||
const QLatin1StringView testString("test string");
|
||||
// QString <-> CFString
|
||||
{
|
||||
QString qtString("test string");
|
||||
QString qtString = testString;
|
||||
const CFStringRef cfString = qtString.toCFString();
|
||||
QCOMPARE(QString::fromCFString(cfString), qtString);
|
||||
CFRelease(cfString);
|
||||
}
|
||||
{
|
||||
QString qtString("test string");
|
||||
QString qtString = testString;
|
||||
const CFStringRef cfString = qtString.toCFString();
|
||||
QString qtStringCopy(qtString);
|
||||
qtString = qtString.toUpper(); // modify
|
||||
@ -29,14 +32,14 @@ void tst_QString_macTypes()
|
||||
{
|
||||
QMacAutoReleasePool pool;
|
||||
|
||||
QString qtString("test string");
|
||||
QString qtString = testString;
|
||||
const NSString *nsString = qtString.toNSString();
|
||||
QCOMPARE(QString::fromNSString(nsString), qtString);
|
||||
}
|
||||
{
|
||||
QMacAutoReleasePool pool;
|
||||
|
||||
QString qtString("test string");
|
||||
QString qtString = testString;
|
||||
const NSString *nsString = qtString.toNSString();
|
||||
QString qtStringCopy(qtString);
|
||||
qtString = qtString.toUpper(); // modify
|
||||
|
Reference in New Issue
Block a user