summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/sdk/console.h79
-rw-r--r--src/sdk/console_win.cpp110
-rw-r--r--src/sdk/sdk.pro2
3 files changed, 122 insertions, 69 deletions
diff --git a/src/sdk/console.h b/src/sdk/console.h
index 8e627574d..cb0d97e42 100644
--- a/src/sdk/console.h
+++ b/src/sdk/console.h
@@ -42,80 +42,18 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
#ifdef Q_OS_WIN
-# include <qt_windows.h>
-# include <wincon.h>
-# include <fstream>
-# include <iostream>
-
-# ifndef ENABLE_INSERT_MODE
-# define ENABLE_INSERT_MODE 0x0020
-# endif
-
-# ifndef ENABLE_QUICK_EDIT_MODE
-# define ENABLE_QUICK_EDIT_MODE 0x0040
-# endif
-
-# ifndef ENABLE_EXTENDED_FLAGS
-# define ENABLE_EXTENDED_FLAGS 0x0080
-# endif
+#include <fstream>
+#include <iostream>
class Console
{
public:
- Console()
- {
- parentConsole = AttachConsole(ATTACH_PARENT_PROCESS);
- if (parentConsole)
- return;
-
- AllocConsole();
- HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE);
- if (handle != INVALID_HANDLE_VALUE) {
- COORD largestConsoleWindowSize = GetLargestConsoleWindowSize(handle);
- largestConsoleWindowSize.X -= 3;
- largestConsoleWindowSize.Y = 5000;
- SetConsoleScreenBufferSize(handle, largestConsoleWindowSize);
- }
-
- handle = GetStdHandle(STD_INPUT_HANDLE);
- if (handle != INVALID_HANDLE_VALUE)
- SetConsoleMode(handle, ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS);
-
- m_oldCin = std::cin.rdbuf();
- m_newCin.open("CONIN$");
- std::cin.rdbuf(m_newCin.rdbuf());
-
- m_oldCout = std::cout.rdbuf();
- m_newCout.open("CONOUT$");
- std::cout.rdbuf(m_newCout.rdbuf());
-
- m_oldCerr = std::cerr.rdbuf();
- m_newCerr.open("CONOUT$");
- std::cerr.rdbuf(m_newCerr.rdbuf());
-# ifndef Q_CC_MINGW
- HMENU systemMenu = GetSystemMenu(GetConsoleWindow(), FALSE);
- if (systemMenu != NULL)
- RemoveMenu(systemMenu, SC_CLOSE, MF_BYCOMMAND);
- DrawMenuBar(GetConsoleWindow());
-# endif
- }
-
- ~Console()
- {
- if (!parentConsole) {
- system("PAUSE");
-
- std::cin.rdbuf(m_oldCin);
- std::cerr.rdbuf(m_oldCerr);
- std::cout.rdbuf(m_oldCout);
- }
-
- FreeConsole();
- }
+ Console();
+ ~Console();
private:
bool parentConsole;
@@ -128,12 +66,15 @@ private:
std::streambuf* m_oldCout;
std::streambuf* m_oldCerr;
};
-#else
+
+#else // Q_OS_WIN
+
class Console
{
public:
Console() {}
};
-#endif
+
+#endif // Q_OS_WIN
#endif // CONSOLE_H
diff --git a/src/sdk/console_win.cpp b/src/sdk/console_win.cpp
new file mode 100644
index 000000000..c918c29e4
--- /dev/null
+++ b/src/sdk/console_win.cpp
@@ -0,0 +1,110 @@
+/**************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Installer Framework.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+**************************************************************************/
+
+#include "console.h"
+
+# include <qt_windows.h>
+# include <wincon.h>
+
+
+# ifndef ENABLE_INSERT_MODE
+# define ENABLE_INSERT_MODE 0x0020
+# endif
+
+# ifndef ENABLE_QUICK_EDIT_MODE
+# define ENABLE_QUICK_EDIT_MODE 0x0040
+# endif
+
+# ifndef ENABLE_EXTENDED_FLAGS
+# define ENABLE_EXTENDED_FLAGS 0x0080
+# endif
+
+
+Console::Console()
+{
+ parentConsole = AttachConsole(ATTACH_PARENT_PROCESS);
+ if (parentConsole)
+ return;
+
+ AllocConsole();
+ HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (handle != INVALID_HANDLE_VALUE) {
+ COORD largestConsoleWindowSize = GetLargestConsoleWindowSize(handle);
+ largestConsoleWindowSize.X -= 3;
+ largestConsoleWindowSize.Y = 5000;
+ SetConsoleScreenBufferSize(handle, largestConsoleWindowSize);
+ }
+
+ handle = GetStdHandle(STD_INPUT_HANDLE);
+ if (handle != INVALID_HANDLE_VALUE)
+ SetConsoleMode(handle, ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS);
+
+ m_oldCin = std::cin.rdbuf();
+ m_newCin.open("CONIN$");
+ std::cin.rdbuf(m_newCin.rdbuf());
+
+ m_oldCout = std::cout.rdbuf();
+ m_newCout.open("CONOUT$");
+ std::cout.rdbuf(m_newCout.rdbuf());
+
+ m_oldCerr = std::cerr.rdbuf();
+ m_newCerr.open("CONOUT$");
+ std::cerr.rdbuf(m_newCerr.rdbuf());
+# ifndef Q_CC_MINGW
+ HMENU systemMenu = GetSystemMenu(GetConsoleWindow(), FALSE);
+ if (systemMenu != NULL)
+ RemoveMenu(systemMenu, SC_CLOSE, MF_BYCOMMAND);
+ DrawMenuBar(GetConsoleWindow());
+# endif
+}
+
+Console::~Console()
+{
+ if (!parentConsole) {
+ system("PAUSE");
+
+ std::cin.rdbuf(m_oldCin);
+ std::cerr.rdbuf(m_oldCerr);
+ std::cout.rdbuf(m_oldCout);
+ }
+
+ FreeConsole();
+}
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro
index e33c53772..25aed1b1a 100644
--- a/src/sdk/sdk.pro
+++ b/src/sdk/sdk.pro
@@ -124,6 +124,8 @@ win32 {
# Force to overwrite the default manifest file with our own extended version.
RC_FILE = installerbase_qt5.rc
QMAKE_MANIFEST = installerbase.manifest
+
+ SOURCES += console_win.cpp
}
macx:include(../../no_app_bundle.pri)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 21:26:47 +0000