AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.12' into 5.13

Browse Source 
Change-Id: Ifa143cc462301aaa305c9c85360e543553a751f0
This commit is contained in:
Qt Forward Merge Bot 2019-02-19 01:00:07 +01:00
commit 67c70b22f6
89 changed files with 165 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/corelib/serialization/cbordump/cbordump.pro
View File

@ -2,8 +2,7 @@ QT += core
QT -= gui
TARGET = cbordump
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
TEMPLATE = app

3
examples/corelib/serialization/convert/convert.pro
View File

@ -2,8 +2,7 @@ QT += core
QT -= gui
TARGET = convert
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
TEMPLATE = app

3
examples/corelib/serialization/savegame/savegame.pro
View File

@ -2,8 +2,7 @@ QT += core
QT -= gui
TARGET = savegame
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
TEMPLATE = app

3
examples/corelib/threads/semaphores/semaphores.pro
View File

@ -1,8 +1,7 @@
SOURCES += semaphores.cpp
QT = core
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline
# install
target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/semaphores

4
examples/corelib/threads/waitconditions/waitconditions.pro
View File

@ -1,6 +1,6 @@
QT = core
CONFIG -= moc app_bundle
CONFIG += console
CONFIG -= moc
CONFIG += cmdline
SOURCES += waitconditions.cpp

3
examples/network/dnslookup/dnslookup.pro
View File

@ -1,7 +1,6 @@
TEMPLATE = app
QT = core network
mac:CONFIG -= app_bundle
win32:CONFIG += console
CONFIG += cmdline
HEADERS += dnslookup.h
SOURCES += dnslookup.cpp

3
examples/network/download/download.pro
View File

@ -1,6 +1,5 @@
QT = core network
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
examples/network/downloadmanager/downloadmanager.pro
View File

@ -1,6 +1,5 @@
QT = core network
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
HEADERS += downloadmanager.h textprogressbar.h
SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp

3
examples/qmake/precompile/precompile.pro
View File

@ -6,8 +6,7 @@
#! [0]
TEMPLATE = app
LANGUAGE = C++
CONFIG += console precompile_header
CONFIG -= app_bundle
CONFIG += cmdline precompile_header
QT += widgets
# Use Precompiled headers (PCH)

3
examples/qtconcurrent/map/map.pro
View File

@ -1,8 +1,7 @@
TEMPLATE = app
TARGET = mapdemo
QT += concurrent
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
examples/qtconcurrent/runfunction/runfunction.pro
View File

@ -1,6 +1,5 @@
QT += concurrent widgets
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
examples/qtconcurrent/wordcount/wordcount.pro
View File

@ -1,6 +1,5 @@
QT += concurrent widgets
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
examples/widgets/statemachine/factorial/factorial.pro
View File

@ -1,6 +1,5 @@
QT = core
win32: CONFIG += console
mac:CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
examples/widgets/statemachine/pingpong/pingpong.pro
View File

@ -1,6 +1,5 @@
QT = core
win32: CONFIG += console
mac:CONFIG -= app_bundle
CONFIG += cmdline
SOURCES = main.cpp

3
examples/xml/htmlinfo/htmlinfo.pro
View File

@ -1,10 +1,9 @@
SOURCES += main.cpp
QT -= gui
CONFIG -= app_bundle
RESOURCES = resources.qrc
win32: CONFIG += console
CONFIG += cmdline
# install
target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo

3
examples/xml/xmlstreamlint/xmlstreamlint.pro
View File

@ -1,5 +1,4 @@
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
QT -= gui
SOURCES += main.cpp

2
mkspecs/common/mac.conf
View File

@ -17,7 +17,7 @@ QMAKE_EXTENSION_SHLIB = dylib
QMAKE_EXTENSIONS_AUX_SHLIB = tbd
QMAKE_LIBDIR =
# The proper SDK sysroot will be automatically prepended
# sdk.prf will prefix the proper SDK sysroot
QMAKE_INCDIR_OPENGL = \
/System/Library/Frameworks/OpenGL.framework/Headers \
/System/Library/Frameworks/AGL.framework/Headers/

2
mkspecs/features/cmdline.prf Normal file
View File

@ -0,0 +1,2 @@
win32: CONFIG *= console
macos: CONFIG -= app_bundle

4
mkspecs/features/mac/sdk.prf
View File

@ -33,6 +33,10 @@ QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)
QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
sysrootified =
for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
QMAKE_INCDIR_OPENGL = $$sysrootified
QMAKESPEC_NAME = $$basename(QMAKESPEC)
# Resolve SDK version of various tools

3
mkspecs/features/qt_test_helper.prf
View File

@ -16,8 +16,7 @@
# Additionally the helper's executable is suffixed with "_helper" to
# avoid name clashes with its folder.
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline
debug_and_release {
CONFIG(debug, debug|release) {

11
qmake/doc/src/qmake-manual.qdoc
View File

@ -1060,8 +1060,12 @@
proper include paths, compiler flags and libraries will
automatically be added to the project.
\row \li console \li The target is a Win32 console application (app only). The
proper include paths, compiler flags and libraries will
automatically be added to the project.
proper include paths, compiler flags and libraries will automatically be
added to the project. Consider using the option \c{cmdline} for
cross-platform applications.
\row \li cmdline \li The target is a cross-platform command line application.
On Windows, this implies \c{CONFIG += console}.
On macOS, this implies \c{CONFIG -= app_bundle}.
\row \li shared \li{1,2} The target is a shared object/DLL. The proper
include paths, compiler flags and libraries will automatically be
added to the project. Note that \c dll can also be used on all platforms;
@ -4909,8 +4913,7 @@
\code
TEMPLATE = app
LANGUAGE = C++
CONFIG += console precompile_header
CONFIG -= app_bundle
CONFIG += cmdline precompile_header
# Use Precompiled headers (PCH)
PRECOMPILED_HEADER = stable.h

9
qmake/generators/unix/unixmake.cpp
View File

@ -506,17 +506,14 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
if (opt.startsWith("-Xarch"))
opt = l.at(++lit); // The user has done the right thing and prefixed each part
}
bool found = false;
for(int x = 0; x < lflags[arch].size(); ++x) {
if (lflags[arch].at(x) == "-framework" && lflags[arch].at(++x) == opt) {
found = true;
lflags[arch].remove(x - 1, 2);
break;
}
}
if(!found) {
lflags[arch].append("-framework");
lflags[arch].append(opt);
}
lflags[arch].append("-framework");
lflags[arch].append(opt);
} else {
lflags[arch].append(opt);
}

4
qmake/qmake.pro
View File

@ -3,8 +3,8 @@
# and the configures.
option(host_build)
CONFIG += console
CONFIG -= qt app_bundle
CONFIG += cmdline
CONFIG -= qt
DEFINES += \
PROEVALUATOR_FULL \

1
src/3rdparty/freetype/src/sfnt/pngshim.c vendored
View File

@ -68,6 +68,7 @@
( ( __clang_major__ >= 4 ) || \
( ( __clang_major__ == 3 ) && ( __clang_minor__ >= 2 ) ) ) ) ) && \
defined( __OPTIMIZE__ ) && \
!defined( __EMSCRIPTEN__ ) && \
__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#ifdef __clang__

24
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -353,21 +353,6 @@ QT_USE_NAMESPACE
[reflectionDelegate applicationDidBecomeActive:notification];
QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
/*
onApplicationChangedActivation(true);
if (!QWidget::mouseGrabber()){
// Update enter/leave immidiatly, don't wait for a move event. But only
// if no grab exists (even if the grab points to this widget, it seems, ref X11)
QPoint qlocal, qglobal;
QWidget *widgetUnderMouse = 0;
qt_mac_getTargetForMouseEvent(0, QEvent::Enter, qlocal, qglobal, 0, &widgetUnderMouse);
QApplicationPrivate::dispatchEnterLeave(widgetUnderMouse, 0);
qt_last_mouse_receiver = widgetUnderMouse;
qt_last_native_mouse_receiver = widgetUnderMouse ?
(widgetUnderMouse->internalWinId() ? widgetUnderMouse : widgetUnderMouse->nativeParentWidget()) : 0;
}
*/
}
- (void)applicationDidResignActive:(NSNotification *)notification
@ -377,15 +362,6 @@ QT_USE_NAMESPACE
[reflectionDelegate applicationDidResignActive:notification];
QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
/*
onApplicationChangedActivation(false);
if (!QWidget::mouseGrabber())
QApplicationPrivate::dispatchEnterLeave(0, qt_last_mouse_receiver);
qt_last_mouse_receiver = 0;
qt_last_native_mouse_receiver = 0;
qt_button_down = 0;
*/
}
- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag

2
src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
View File

@ -168,10 +168,10 @@ public:
uint processEventsCalled;
NSModalSession currentModalSessionCached;
NSModalSession currentModalSession();
void updateChildrenWorksWhenModal();
void temporarilyStopAllModalSessions();
void beginModalSession(QWindow *widget);
void endModalSession(QWindow *widget);
bool hasModalSession() const;
void cleanupModalSessions();
void cancelWaitForMoreEvents();

40
src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
View File

@ -672,43 +672,9 @@ NSModalSession QCocoaEventDispatcherPrivate::currentModalSession()
return currentModalSessionCached;
}
static void setChildrenWorksWhenModal(QWindow *window, bool worksWhenModal)
bool QCocoaEventDispatcherPrivate::hasModalSession() const
{
Q_UNUSED(window)
Q_UNUSED(worksWhenModal)
// For NSPanels (but not NSWindows, sadly), we can set the flag
// worksWhenModal, so that they are active even when they are not modal.
/*
### not ported
QList<QDialog *> dialogs = window->findChildren<QDialog *>();
for (int i=0; i<dialogs.size(); ++i){
NSWindow *window = qt_mac_window_for(dialogs[i]);
if (window && [window isKindOfClass:[NSPanel class]]) {
[static_cast<NSPanel *>(window) setWorksWhenModal:worksWhenModal];
if (worksWhenModal && [window isVisible]){
[window orderFront:window];
}
}
}
*/
}
void QCocoaEventDispatcherPrivate::updateChildrenWorksWhenModal()
{
// Make the dialog children of the window
// active. And make the dialog children of
// the previous modal dialog unactive again:
QMacAutoReleasePool pool;
int size = cocoaModalSessionStack.size();
if (size > 0){
if (QWindow *prevModal = cocoaModalSessionStack[size-1].window)
setChildrenWorksWhenModal(prevModal, true);
if (size > 1){
if (QWindow *prevModal = cocoaModalSessionStack[size-2].window)
setChildrenWorksWhenModal(prevModal, false);
}
}
return !cocoaModalSessionStack.isEmpty();
}
void QCocoaEventDispatcherPrivate::cleanupModalSessions()
@ -743,7 +709,6 @@ void QCocoaEventDispatcherPrivate::cleanupModalSessions()
cocoaModalSessionStack.remove(i);
}
updateChildrenWorksWhenModal();
cleanupModalSessionsNeeded = false;
}
@ -764,7 +729,6 @@ void QCocoaEventDispatcherPrivate::beginModalSession(QWindow *window)
// stopped in cleanupModalSessions()).
QCocoaModalSessionInfo info = {window, nullptr, nullptr};
cocoaModalSessionStack.push(info);
updateChildrenWorksWhenModal();
currentModalSessionCached = nullptr;
}

1
src/plugins/platforms/cocoa/qcocoawindow.h
View File

@ -253,7 +253,6 @@ public: // for QNSView
bool m_needsInvalidateShadow;
bool m_hasModalSession;
bool m_frameStrutEventsEnabled;
QRect m_exposedRect;
int m_registerTouchCount;

85
src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -153,7 +153,6 @@ QCocoaWindow::QCocoaWindow(QWindow *win, WId nativeHandle)
, m_inSetStyleMask(false)
, m_menubar(nullptr)
, m_needsInvalidateShadow(false)
, m_hasModalSession(false)
, m_frameStrutEventsEnabled(false)
, m_registerTouchCount(0)
, m_resizableTransientParent(false)
@ -304,13 +303,17 @@ void QCocoaWindow::setVisible(bool visible)
{
qCDebug(lcQpaWindow) << "QCocoaWindow::setVisible" << window() << visible;
m_inSetVisible = true;
QScopedValueRollback<bool> rollback(m_inSetVisible, true);
QMacAutoReleasePool pool;
QCocoaWindow *parentCocoaWindow = nullptr;
if (window()->transientParent())
parentCocoaWindow = static_cast<QCocoaWindow *>(window()->transientParent()->handle());
auto eventDispatcher = [] {
return static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(qApp->eventDispatcher()));
};
if (visible) {
// We need to recreate if the modality has changed as the style mask will need updating
recreateWindowIfNeeded();
@ -351,68 +354,46 @@ void QCocoaWindow::setVisible(bool visible)
applyWindowState(window()->windowStates());
if (window()->windowState() != Qt::WindowMinimized) {
if ((window()->modality() == Qt::WindowModal
|| window()->type() == Qt::Sheet)
&& parentCocoaWindow) {
// show the window as a sheet
if (parentCocoaWindow && (window()->modality() == Qt::WindowModal || window()->type() == Qt::Sheet)) {
// Show the window as a sheet
[parentCocoaWindow->nativeWindow() beginSheet:m_view.window completionHandler:nil];
} else if (window()->modality() != Qt::NonModal) {
// show the window as application modal
QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
Q_ASSERT(cocoaEventDispatcher);
QCocoaEventDispatcherPrivate *cocoaEventDispatcherPrivate = static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(cocoaEventDispatcher));
cocoaEventDispatcherPrivate->beginModalSession(window());
m_hasModalSession = true;
} else if ([m_view.window canBecomeKeyWindow]) {
QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
QCocoaEventDispatcherPrivate *cocoaEventDispatcherPrivate = nullptr;
if (cocoaEventDispatcher)
cocoaEventDispatcherPrivate = static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(cocoaEventDispatcher));
if (cocoaEventDispatcherPrivate && cocoaEventDispatcherPrivate->cocoaModalSessionStack.isEmpty())
[m_view.window makeKeyAndOrderFront:nil];
else
[m_view.window orderFront:nil];
} else if (window()->modality() == Qt::ApplicationModal) {
// Show the window as application modal
eventDispatcher()->beginModalSession(window());
} else if (m_view.window.canBecomeKeyWindow && !eventDispatcher()->hasModalSession()) {
[m_view.window makeKeyAndOrderFront:nil];
} else {
[m_view.window orderFront:nil];
}
// We want the events to properly reach the popup, dialog, and tool
if ((window()->type() == Qt::Popup || window()->type() == Qt::Dialog || window()->type() == Qt::Tool)
&& [m_view.window isKindOfClass:[NSPanel class]]) {
((NSPanel *)m_view.window).worksWhenModal = YES;
if (!(parentCocoaWindow && window()->transientParent()->isActive()) && window()->type() == Qt::Popup) {
removeMonitor();
NSEventMask eventMask = NSEventMaskLeftMouseDown | NSEventMaskRightMouseDown
| NSEventMaskOtherMouseDown | NSEventMaskMouseMoved;
monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:eventMask handler:^(NSEvent *e) {
const auto button = cocoaButton2QtButton(e);
const auto buttons = currentlyPressedMouseButtons();
const auto eventType = cocoaEvent2QtMouseEvent(e);
const auto globalPoint = QCocoaScreen::mapFromNative(NSEvent.mouseLocation);
const auto localPoint = window()->mapFromGlobal(globalPoint.toPoint());
QWindowSystemInterface::handleMouseEvent(window(), localPoint, globalPoint, buttons, button, eventType);
}];
}
// Close popup when clicking outside it
if (window()->type() == Qt::Popup && !(parentCocoaWindow && window()->transientParent()->isActive())) {
removeMonitor();
NSEventMask eventMask = NSEventMaskLeftMouseDown | NSEventMaskRightMouseDown
| NSEventMaskOtherMouseDown | NSEventMaskMouseMoved;
monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:eventMask handler:^(NSEvent *e) {
const auto button = cocoaButton2QtButton(e);
const auto buttons = currentlyPressedMouseButtons();
const auto eventType = cocoaEvent2QtMouseEvent(e);
const auto globalPoint = QCocoaScreen::mapFromNative(NSEvent.mouseLocation);
const auto localPoint = window()->mapFromGlobal(globalPoint.toPoint());
QWindowSystemInterface::handleMouseEvent(window(), localPoint, globalPoint, buttons, button, eventType);
}];
}
}
}
// In some cases, e.g. QDockWidget, the content view is hidden before moving to its own
// Cocoa window, and then shown again. Therefore, we test for the view being hidden even
// if it's attached to an NSWindow.
if ([m_view isHidden])
[m_view setHidden:NO];
} else {
// qDebug() << "close" << this;
QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
QCocoaEventDispatcherPrivate *cocoaEventDispatcherPrivate = nullptr;
if (cocoaEventDispatcher)
cocoaEventDispatcherPrivate = static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(cocoaEventDispatcher));
// Window not visible, hide it
if (isContentView()) {
if (m_hasModalSession) {
if (cocoaEventDispatcherPrivate)
cocoaEventDispatcherPrivate->endModalSession(window());
m_hasModalSession = false;
if (eventDispatcher()->hasModalSession()) {
eventDispatcher()->endModalSession(window());
} else {
if ([m_view.window isSheet]) {
Q_ASSERT_X(parentCocoaWindow, "QCocoaWindow", "Window modal dialog has no transient parent.");
@ -422,8 +403,7 @@ void QCocoaWindow::setVisible(bool visible)
[m_view.window orderOut:nil];
if (m_view.window == [NSApp keyWindow]
&& !(cocoaEventDispatcherPrivate && cocoaEventDispatcherPrivate->currentModalSession())) {
if (m_view.window == [NSApp keyWindow] && !eventDispatcher()->hasModalSession()) {
// Probably because we call runModalSession: outside [NSApp run] in QCocoaEventDispatcher
// (e.g., when show()-ing a modal QDialog instead of exec()-ing it), it can happen that
// the current NSWindow is still key after being ordered out. Then, after checking we
@ -435,6 +415,7 @@ void QCocoaWindow::setVisible(bool visible)
} else {
[m_view setHidden:YES];
}
removeMonitor();
if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
@ -448,8 +429,6 @@ void QCocoaWindow::setVisible(bool visible)
nativeParentWindow.styleMask |= NSWindowStyleMaskResizable;
}
}
m_inSetVisible = false;
}
NSInteger QCocoaWindow::windowLevel(Qt::WindowFlags flags)

1
src/plugins/platforms/cocoa/qnswindow.h
View File

@ -62,6 +62,7 @@ QT_FORWARD_DECLARE_CLASS(QCocoaWindow)
@protocol QNSWindowProtocol
@optional
- (BOOL)canBecomeKeyWindow;
- (BOOL)worksWhenModal;
- (void)sendEvent:(NSEvent*)theEvent;
- (void)closeAndRelease;
- (void)dealloc;

13
src/plugins/platforms/cocoa/qnswindow.mm
View File

@ -177,6 +177,19 @@ static bool isMouseEvent(NSEvent *ev)
return canBecomeMain;
}
- (BOOL)worksWhenModal
{
if ([self isKindOfClass:[QNSPanel class]]) {
if (QCocoaWindow *pw = self.platformWindow) {
Qt::WindowType type = pw->window()->type();
if (type == Qt::Popup || type == Qt::Dialog || type == Qt::Tool)
return YES;
}
}
return qt_objcDynamicSuper();
}
- (BOOL)isOpaque
{
return self.platformWindow ?

2
src/tools/moc/util/generate_keywords.pro
View File

@ -1,4 +1,4 @@
CONFIG -= moc
mac:CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += generate_keywords.cpp

3
tests/auto/corelib/global/qlogging/app/app.pro
View File

@ -14,8 +14,7 @@ QT = core
DESTDIR = ./
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline
SOURCES += main.cpp
DEFINES += QT_MESSAGELOGCONTEXT

3
tests/auto/corelib/io/qlockfile/qlockfiletesthelper/qlockfile_test_helper.pro
View File

@ -1,7 +1,6 @@
TARGET = qlockfile_test_helper
SOURCES += qlockfile_test_helper.cpp
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
QT = core
DESTDIR = ./

3
tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro
View File

@ -1,5 +1,4 @@
SOURCES = main.cpp
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
QT = core
DESTDIR = ./

3
tests/auto/corelib/io/qprocess/testDetached/testDetached.pro
View File

@ -1,6 +1,5 @@
SOURCES = main.cpp
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
INSTALLS =
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro
View File

@ -1,5 +1,5 @@
SOURCES += main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

3
tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro
View File

@ -1,5 +1,4 @@
SOURCES = main.cpp
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline
DESTDIR = ./
QT = core

4
tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro
View File

@ -1,4 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

3
tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro
View File

@ -1,5 +1,4 @@
SOURCES += main.cpp
QT += widgets
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro
View File

@ -1,5 +1,5 @@
SOURCES = main.cpp
CONFIG += console
CONFIG -= qt app_bundle
CONFIG += cmdline
CONFIG -= qt
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro
View File

@ -1,5 +1,5 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro
View File

@ -1,6 +1,6 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
win32:!mingw:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS-
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro
View File

@ -1,4 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro
View File

@ -1,4 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro
View File

@ -1,4 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

6
tests/auto/corelib/io/qprocess/testProcessEnvironment/testProcessEnvironment.pro
View File

@ -1,8 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt
CONFIG += console
CONFIG += cmdline
DESTDIR = ./
mac {
CONFIG -= app_bundle
}

4
tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro
View File

@ -1,4 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

4
tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro
View File

@ -1,6 +1,6 @@
SOURCES = main.cpp
CONFIG += console
CONFIG -= qt app_bundle
CONFIG += cmdline
CONFIG -= qt
DESTDIR = ./
QT = core

4
tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro
View File

@ -1,5 +1,5 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./
QT = core

4
tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro
View File

@ -1,6 +1,6 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./
OBJECTS_DIR = $${OBJECTS_DIR}-nospace
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

4
tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro
View File

@ -1,6 +1,6 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./
OBJECTS_DIR = $${OBJECTS_DIR}-onespace

4
tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro
View File

@ -1,6 +1,6 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./
OBJECTS_DIR = $${OBJECTS_DIR}-twospaces

4
tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro
View File

@ -1,4 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

3
tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro
View File

@ -1,5 +1,4 @@
SOURCES = main.cpp
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
DESTDIR = ./
QT = core

4
tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
View File

@ -6,7 +6,7 @@ unix {
SOURCES = main_unix.cpp
}
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./
QT = core

6
tests/auto/corelib/io/qprocess/testSpaceInName/testSpaceInName.pro
View File

@ -1,9 +1,5 @@
SOURCES = main.cpp
CONFIG -= qt
CONFIG += console
CONFIG += cmdline
DESTDIR = "../test Space In Name"
mac {
CONFIG -= app_bundle
}
QT = core

3
tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/readAllStdinProcess.pro
View File

@ -1,7 +1,6 @@
SOURCES += main.cpp
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
DESTDIR = ./
# This app is testdata for tst_qtextstream

3
tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/readLineStdinProcess.pro
View File

@ -1,7 +1,6 @@
SOURCES += main.cpp
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
DESTDIR = ./
# This app is testdata for tst_qtextstream

3
tests/auto/corelib/serialization/qtextstream/stdinProcess/stdinProcess.pro
View File

@ -1,7 +1,6 @@
SOURCES += main.cpp
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
DESTDIR = ./
# This app is testdata for tst_qtextstream

3
tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro
View File

@ -9,8 +9,7 @@ debug_and_release {
TARGET = ../crashOnExit_helper
}
QT = core
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline
# This app is testdata for tst_qthreadstorage
target.path = $$[QT_INSTALL_TESTS]/tst_qthreadstorage/$$TARGET

3
tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.pro
View File

@ -1,5 +1,4 @@
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
QT = core
DESTDIR = ./

3
tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro
View File

@ -1,8 +1,7 @@
SOURCES += syslocaleapp.cpp
DESTDIR = ./
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
QT = core

3
tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
View File

@ -470,9 +470,8 @@ namespace QTest {
"TEMPLATE = app\n"
"\n"
"TARGET = externaltest\n"
"CONFIG -= app_bundle\n" // for the Mac
"CONFIG -= debug_and_release\n"
"CONFIG += console\n"
"CONFIG += cmdline\n"
"DESTDIR = .\n"
"OBJECTS_DIR = .\n"
"UI_DIR = .\n"

3
tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro
View File

@ -2,6 +2,5 @@ SOURCES = qpinger.cpp ../interface.cpp
HEADERS = ../interface.h
TARGET = qpinger
DESTDIR = ./
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline
QT = core dbus

4
tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
View File

@ -2,6 +2,4 @@ SOURCES = qpong.cpp
TARGET = qpong
DESTDIR = ./
QT = core dbus
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline

2
tests/auto/gui/qopengl/qopengl.pro
View File

@ -8,4 +8,4 @@ QT += gui-private core-private testlib
SOURCES += tst_qopengl.cpp
linux:qtConfig(xcb):qtConfig(xcb-glx):qtConfig(xcb-xlib):!qtConfig(egl): DEFINES += USE_GLX
linux:qtConfig(xcb):qtConfig(xcb-glx-plugin): DEFINES += USE_GLX

4
tests/auto/network/access/qnetworkreply/echo/echo.pro
View File

@ -1,4 +1,4 @@
SOURCES += main.cpp
QT = core
CONFIG -= app_bundle debug_and_release_target
CONFIG += console
CONFIG -= debug_and_release_target
CONFIG += cmdline

3
tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
View File

@ -5,5 +5,4 @@ QT = core network
DESTDIR = ./
win32:CONFIG += console
mac:CONFIG -= app_bundle
CONFIG += cmdline

3
tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro
View File

@ -3,7 +3,6 @@ QT = core network testlib
DESTDIR = ./
TARGET = socketprocess
win32:CONFIG += console
mac:CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
View File

@ -2,8 +2,7 @@ HEADERS += Test.h
SOURCES += main.cpp Test.cpp
QT = core network testlib
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline
DESTDIR = ./
MOC_DIR = .moc/
TMP_DIR = .tmp/

3
tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
View File

@ -1,6 +1,5 @@
QT = core network
SOURCES += main.cpp
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
TARGET = clientserver
DESTDIR = ./

4
tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
View File

@ -1,5 +1,3 @@
SOURCES += main.cpp
QT = core network
CONFIG -= app_bundle
CONFIG += console
CONFIG += cmdline

4
tests/auto/other/qprocess_and_guieventloop/write-read-write/write-read-write.pro
View File

@ -1,4 +1,4 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
DESTDIR = ./

3
tests/baselineserver/src/baselineserver.pro
View File

@ -5,8 +5,7 @@ QT += core network
TARGET = baselineserver
DESTDIR = ../bin
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
TEMPLATE = app

4
tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
View File

@ -1,5 +1,5 @@
SOURCES = main.cpp
CONFIG -= qt app_bundle
CONFIG += console
CONFIG -= qt
CONFIG += cmdline
winrt: QMAKE_LFLAGS += /ENTRY:mainCRTStartup
DESTDIR = ./

4
tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro
View File

@ -1,5 +1,5 @@
TARGET = tst_bench_qcryptographichash
CONFIG -= debug app_bundle
CONFIG += release console
CONFIG -= debug
CONFIG += release cmdline
QT = core testlib
SOURCES += main.cpp

3
tests/manual/embeddedintoforeignwindow/embeddedintoforeignwindow.pro
View File

@ -1,7 +1,6 @@
TEMPLATE = app
QT += gui-private
CONFIG += console c++11
CONFIG -= app_bundle
CONFIG += cmdline c++11
SOURCES += main.cpp itemwindow.cpp
HEADERS += itemwindow.h
include(../diaglib/diaglib.pri)

3
tests/manual/filetest/filetest.pro
View File

@ -1,6 +1,5 @@
TEMPLATE = app
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
tests/manual/foreignwindows/foreignwindows.pro
View File

@ -1,6 +1,5 @@
TEMPLATE = app
QT += widgets
CONFIG += console c++11
CONFIG -= app_bundle
CONFIG += cmdline c++11
SOURCES += main.cpp
include(../diaglib/diaglib.pri)

3
tests/manual/highdpi/highdpi.pro
View File

@ -2,8 +2,7 @@ TEMPLATE = app
TARGET = highdpi
INCLUDEPATH += .
QT += widgets gui-private
CONFIG +=console
CONFIG -= app_bundle
CONFIG += cmdline
CONFIG += c++11
# Input
SOURCES += \

3
tests/manual/lance/lance.pro
View File

@ -1,6 +1,5 @@
LANCELOT_DIR = $$PWD/../../auto/other/lancelot
CONFIG+=console moc
CONFIG -= app_bundle
CONFIG += cmdline moc
TEMPLATE = app
INCLUDEPATH += . $$LANCELOT_DIR
QT += core-private gui-private widgets printsupport

3
tests/manual/qdesktopservices/qdesktopservices.pro
View File

@ -1,8 +1,7 @@
QT += testlib
TARGET = tst_qdesktopservices
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
TEMPLATE = app

3
tests/manual/qmimedatabase/qmimedatabase.pro
View File

@ -1,5 +1,4 @@
TEMPLATE = app
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
tests/manual/qstorageinfo/qstorageinfo.pro
View File

@ -1,4 +1,3 @@
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
tests/manual/qsysinfo/qsysinfo.pro
View File

@ -1,7 +1,6 @@
QT = core
TARGET = qsysinfo
TEMPLATE = app
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
SOURCES += main.cpp

3
tests/manual/widgets/styles/styles.pro
View File

@ -1,7 +1,6 @@
TEMPLATE = app
QT = widgets
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
CONFIG += c++11
SOURCES += main.cpp

3
util/glgen/glgen.pro
View File

@ -1,6 +1,5 @@
QT -= gui
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline
# Uncomment following to enable debug output
#DEFINES += SPECPARSER_DEBUG

3
util/gradientgen/tobinaryjson.pro
View File

@ -1,4 +1,3 @@
SOURCES += tobinaryjson.cpp
QT = core
CONFIG += console
CONFIG -= app_bundle
CONFIG += cmdline