diff --git a/CMakeLists.txt b/CMakeLists.txt index 35268b756..290187332 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ else(APPLE) endif(APPLE) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk") # rpath resolve. #set(CMAKE_BUILD_WITH_INSTALL_RPATH YES) // would cause wheelEvent problem on centos/fedora when compiled with qt5 diff --git a/src/WizConsoleDialog.cpp b/src/WizConsoleDialog.cpp index 9ab1ba1b6..e36cd05b4 100755 --- a/src/WizConsoleDialog.cpp +++ b/src/WizConsoleDialog.cpp @@ -62,16 +62,6 @@ WizConsoleDialog::~WizConsoleDialog() { } -void WizConsoleDialog::showEvent(QShowEvent *event) -{ - QScrollBar* vScroll = m_ui->editConsole->verticalScrollBar(); - vScroll->setValue(vScroll->maximum()); - - move(parentWidget()->geometry().center() - rect().center()); - - QDialog::showEvent(event); -} - void WizConsoleDialog::insertLog(const QString& text) { QTextCursor cursor = m_ui->editConsole->textCursor(); diff --git a/src/WizConsoleDialog.h b/src/WizConsoleDialog.h index f9e422795..abcfaed38 100755 --- a/src/WizConsoleDialog.h +++ b/src/WizConsoleDialog.h @@ -18,9 +18,6 @@ class WizConsoleDialog: public QDialog WizConsoleDialog(WizExplorerApp& app, QWidget* parent = 0); ~WizConsoleDialog(); -protected: - virtual void showEvent(QShowEvent *event); - private: WizExplorerApp& m_app; Ui::WizConsoleDialog* m_ui;