Skip to content

Commit 676d691

Browse files
committed
调整资源结构,修正qmake的一些错误
1 parent 33c17b8 commit 676d691

22 files changed

+1724
-23698
lines changed

example/MainWindowExample/MainWindowExample.pro

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
1212
TARGET = SARibbonMainWindowExample
1313
TEMPLATE = app
1414

15-
SOURCES += main.cpp\
16-
mainwindow.cpp
15+
SOURCES += main.cpp \
16+
mainwindow.cpp \
17+
ApplicationWidget.cpp\
1718
18-
HEADERS += \
19-
mainwindow.h
19+
HEADERS += \
20+
mainwindow.h \
21+
ApplicationWidget.h \
22+
23+
FORMS += \
24+
ApplicationWidget.ui \
2025
2126
RESOURCES += \
2227
saribbonresouce.qrc \

example/MdiAreaWindowExample/mdimainwindow.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ void MainWindow::onMdiAreaSubWindowActivated(QMdiSubWindow* window)
5757
m_mdiCornerWidget = cw;
5858
}
5959
}
60+
#else
61+
Q_UNUSED(window);
6062
#endif
6163
}
6264

@@ -67,6 +69,7 @@ void MainWindow::onMdiAreaSubWindowActivated(QMdiSubWindow* window)
6769
*/
6870
void MainWindow::onSubWindowStateChanged(Qt::WindowStates oldState, Qt::WindowStates newState)
6971
{
72+
Q_UNUSED(oldState);
7073
#if SARIBBON_USE_3RDPARTY_FRAMELESSHELPER
7174
if (newState.testFlag(Qt::WindowMaximized)) {
7275
SARibbonBar* ribbon = ribbonBar();
@@ -77,5 +80,7 @@ void MainWindow::onSubWindowStateChanged(Qt::WindowStates oldState, Qt::WindowSt
7780
m_mdiCornerWidget = cw;
7881
}
7982
}
83+
#else
84+
Q_UNUSED(newState);
8085
#endif
8186
}

example/NormalMenuBarExample/MainWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "MainWindow.h"
22
#include "ui_MainWindow.h"
33

4-
MainWindow::MainWindow(QWidget* parent) : SARibbonMainWindow(parent, false)
4+
MainWindow::MainWindow(QWidget* parent) : SARibbonMainWindow(parent, SARibbonMainWindowStyleFlag::UseNativeMenuBar)
55
{
66
if (!isUseRibbon()) {
77
ui = new Ui::MainWindow;

0 commit comments

Comments
 (0)