adopted to the newest cygwin version. This has been triggered by BMW.
This commit is contained in:
@ -44,7 +44,6 @@
|
|||||||
*/
|
*/
|
||||||
PHelp::PHelp(const QString &url)
|
PHelp::PHelp(const QString &url)
|
||||||
{
|
{
|
||||||
#ifndef _WIN32GCC
|
|
||||||
fProgress = 0;
|
fProgress = 0;
|
||||||
|
|
||||||
QNetworkProxyFactory::setUseSystemConfiguration(true);
|
QNetworkProxyFactory::setUseSystemConfiguration(true);
|
||||||
@ -72,7 +71,6 @@ PHelp::PHelp(const QString &url)
|
|||||||
|
|
||||||
setCentralWidget(fView);
|
setCentralWidget(fView);
|
||||||
setUnifiedTitleAndToolBarOnMac(true);
|
setUnifiedTitleAndToolBarOnMac(true);
|
||||||
#endif // _WIN32GCC
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
@ -2244,12 +2244,8 @@ void PTextEdit::musrDump()
|
|||||||
*/
|
*/
|
||||||
void PTextEdit::helpContents()
|
void PTextEdit::helpContents()
|
||||||
{
|
{
|
||||||
#ifdef _WIN32GCC
|
|
||||||
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
|
|
||||||
#else
|
|
||||||
PHelp *help = new PHelp(fAdmin->getHelpUrl("main"));
|
PHelp *help = new PHelp(fAdmin->getHelpUrl("main"));
|
||||||
help->show();
|
help->show();
|
||||||
#endif // _WIN32GCC
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
|
@ -42,7 +42,7 @@ exists ( /opt/fontconfig-2.8.0/lib/libfontconfig.so ) {
|
|||||||
|
|
||||||
exists( /usr/bin/cygwin1.dll ) {
|
exists( /usr/bin/cygwin1.dll ) {
|
||||||
QMAKE_CXXFLAGS += -D_WIN32GCC
|
QMAKE_CXXFLAGS += -D_WIN32GCC
|
||||||
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
|
QMAKE_LFLAGS_APP = -Wl,--enable-auto-import
|
||||||
}
|
}
|
||||||
|
|
||||||
isEmpty( CC ) {
|
isEmpty( CC ) {
|
||||||
|
Reference in New Issue
Block a user