Compare commits
No commits in common. "475cb54d736c0b5c68bf3687c0347791c6b2d965" and "6221eb4178e63befe0fcee28f5136b3f7cfb2579" have entirely different histories.
475cb54d73
...
6221eb4178
|
@ -55,8 +55,6 @@ jobs:
|
||||||
|
|
||||||
- name: package
|
- name: package
|
||||||
run: |
|
run: |
|
||||||
# 先删除所有dSYM文件,减少包的体积
|
|
||||||
sudo find /Users/runner/work/FluentUI/Qt/6.6.1/macos/qml -name "*.dSYM" | xargs rm -r
|
|
||||||
# 拷贝依赖
|
# 拷贝依赖
|
||||||
sudo macdeployqt bin/release/${targetName}.app -qmldir=. -dmg
|
sudo macdeployqt bin/release/${targetName}.app -qmldir=. -dmg
|
||||||
|
|
||||||
|
|
|
@ -94,9 +94,6 @@ QString Log::prettyProductInfoWrapper()
|
||||||
|
|
||||||
static inline void myMessageHandler(const QtMsgType type, const QMessageLogContext &context, const QString &message)
|
static inline void myMessageHandler(const QtMsgType type, const QMessageLogContext &context, const QString &message)
|
||||||
{
|
{
|
||||||
if(message == "Could not get the INetworkConnection instance for the adapter GUID."){
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if(logLevelMap[type]>g_logLevel){
|
if(logLevelMap[type]>g_logLevel){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -168,13 +165,12 @@ static inline void myMessageHandler(const QtMsgType type, const QMessageLogConte
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Log::setup(const QString &app,int level)
|
void Log::setup(const QString &app)
|
||||||
{
|
{
|
||||||
Q_ASSERT(!app.isEmpty());
|
Q_ASSERT(!app.isEmpty());
|
||||||
if (app.isEmpty()) {
|
if (app.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
g_logLevel = level;
|
|
||||||
static bool once = false;
|
static bool once = false;
|
||||||
if (once) {
|
if (once) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
namespace Log
|
namespace Log
|
||||||
{
|
{
|
||||||
QString prettyProductInfoWrapper();
|
QString prettyProductInfoWrapper();
|
||||||
void setup(const QString &app,int level = 4);
|
void setup(const QString &app);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // LOG_H
|
#endif // LOG_H
|
||||||
|
|
|
@ -44,10 +44,4 @@ private: \
|
||||||
return Singleton<Class>::getInstance(); \
|
return Singleton<Class>::getInstance(); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define HIDE_CONSTRUCTOR(Class) \
|
|
||||||
private: \
|
|
||||||
Class() = default; \
|
|
||||||
Class(const Class& other) = delete; \
|
|
||||||
Class& operator=(const Class& other) = delete;
|
|
||||||
|
|
||||||
#endif // SINGLETON_H
|
#endif // SINGLETON_H
|
||||||
|
|
|
@ -26,6 +26,7 @@ TextEdit {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
cursorShape: Qt.IBeamCursor
|
cursorShape: Qt.IBeamCursor
|
||||||
acceptedButtons: Qt.RightButton
|
acceptedButtons: Qt.RightButton
|
||||||
|
visible: !readOnly
|
||||||
onClicked: control.echoMode !== TextInput.Password && menu.popup()
|
onClicked: control.echoMode !== TextInput.Password && menu.popup()
|
||||||
}
|
}
|
||||||
FluTextBoxMenu{
|
FluTextBoxMenu{
|
||||||
|
|
|
@ -26,6 +26,7 @@ TextEdit {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
cursorShape: Qt.IBeamCursor
|
cursorShape: Qt.IBeamCursor
|
||||||
acceptedButtons: Qt.RightButton
|
acceptedButtons: Qt.RightButton
|
||||||
|
visible: !readOnly
|
||||||
onClicked: control.echoMode !== TextInput.Password && menu.popup()
|
onClicked: control.echoMode !== TextInput.Password && menu.popup()
|
||||||
}
|
}
|
||||||
FluTextBoxMenu{
|
FluTextBoxMenu{
|
||||||
|
|
|
@ -44,10 +44,4 @@ private: \
|
||||||
return Singleton<Class>::getInstance(); \
|
return Singleton<Class>::getInstance(); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define HIDE_CONSTRUCTOR(Class) \
|
|
||||||
private: \
|
|
||||||
Class() = default; \
|
|
||||||
Class(const Class& other) = delete; \
|
|
||||||
Class& operator=(const Class& other) = delete;
|
|
||||||
|
|
||||||
#endif // SINGLETON_H
|
#endif // SINGLETON_H
|
||||||
|
|
Loading…
Reference in New Issue