diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:19:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:34:24 +0200 |
| commit | d0a0a3c0418a0fdd2ed84b2a5f7e6565537715c6 (patch) | |
| tree | d6aeb4d51caf30ccf23eadb806a09295cbf679cd /tests/auto/corelib/kernel/qcoreapplication | |
| parent | 9f405f98a4247cd263b9c5d35659a4ba89e282de (diff) | |
| parent | ac35f9c44c0fb3b2f40ae5585c497200b2ba743d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/network/fortuneclient/client.cpp
examples/network/fortuneserver/server.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
src/plugins/platforms/cocoa/qcocoabackingstore.h
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoascreen.h
src/plugins/platforms/ios/qiosbackingstore.h
src/plugins/sqldrivers/oci/qsql_oci.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
Diffstat (limited to 'tests/auto/corelib/kernel/qcoreapplication')
| -rw-r--r-- | tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro index e37542be65..1a76085c1b 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -5,5 +5,5 @@ SOURCES = tst_qcoreapplication.cpp HEADERS = tst_qcoreapplication.h win32: VERSION = 1.2.3.4 else: VERSION = 1.2.3 -darwin: QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote($$PWD/Info.plist) +QMAKE_INFO_PLIST = $$PWD/Info.plist requires(qtConfig(private_tests)) |