修复一个可能导致编译错误的问题

188080501 · Jul 4, 2016 · 482da40 · 482da40
1 parent 4f68179
commit 482da40
Show file tree

Hide file tree

Showing 71 changed files with 2 additions and 1 deletion.
diff --git a/Groups/Make/FontToPng/Resource/Font/Elusive/Elusive.ttf b/Groups/Make/FontToPng/Resource/Font/Elusive/Elusive.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/Elusive/Elusive.txt b/Groups/Make/FontToPng/Resource/Font/Elusive/Elusive.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/FontAwesome/FontAwesome.ttf b/Groups/Make/FontToPng/Resource/Font/FontAwesome/FontAwesome.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/FontAwesome/FontAwesome.txt b/Groups/Make/FontToPng/Resource/Font/FontAwesome/FontAwesome.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/FontToPngFont.qrc b/Groups/Make/FontToPng/Resource/Font/FontToPngFont.qrc
diff --git a/Groups/Make/FontToPng/Resource/Font/Foundation/Foundation.ttf b/Groups/Make/FontToPng/Resource/Font/Foundation/Foundation.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/Foundation/Foundation.txt b/Groups/Make/FontToPng/Resource/Font/Foundation/Foundation.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/GlyphiconsHalflings/GlyphiconsHalflings.ttf b/Groups/Make/FontToPng/Resource/Font/GlyphiconsHalflings/GlyphiconsHalflings.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/IcoMoon/IcoMoon.txt b/Groups/Make/FontToPng/Resource/Font/IcoMoon/IcoMoon.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/IconFont/IconFont.ttf b/Groups/Make/FontToPng/Resource/Font/IconFont/IconFont.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/IconWorks/IconWorks.txt b/Groups/Make/FontToPng/Resource/Font/IconWorks/IconWorks.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/Icons8/Icons8.ttf b/Groups/Make/FontToPng/Resource/Font/Icons8/Icons8.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/Icons8/Icons8.txt b/Groups/Make/FontToPng/Resource/Font/Icons8/Icons8.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/JustVector/JustVector.ttf b/Groups/Make/FontToPng/Resource/Font/JustVector/JustVector.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/JustVector/JustVector.txt b/Groups/Make/FontToPng/Resource/Font/JustVector/JustVector.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/MaterialDesign/MaterialDesign.ttf b/Groups/Make/FontToPng/Resource/Font/MaterialDesign/MaterialDesign.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/Metrize/Metrize.ttf b/Groups/Make/FontToPng/Resource/Font/Metrize/Metrize.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/Metrize/Metrize.txt b/Groups/Make/FontToPng/Resource/Font/Metrize/Metrize.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/Mfglabs/Mfglabs.txt b/Groups/Make/FontToPng/Resource/Font/Mfglabs/Mfglabs.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/OpenIconic/OpenIconic.txt b/Groups/Make/FontToPng/Resource/Font/OpenIconic/OpenIconic.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/Socicon/Socicon.ttf b/Groups/Make/FontToPng/Resource/Font/Socicon/Socicon.ttf
diff --git a/Groups/Make/FontToPng/Resource/Font/Socicon/Socicon.txt b/Groups/Make/FontToPng/Resource/Font/Socicon/Socicon.txt
diff --git a/Groups/Make/FontToPng/Resource/Font/Typicons/Typicons.txt b/Groups/Make/FontToPng/Resource/Font/Typicons/Typicons.txt
diff --git a/Groups/Make/FontToPng/cpp/FontToPng.h b/Groups/Make/FontToPng/cpp/FontToPng.h
@@ -10,6 +10,7 @@
 #include <QImage>
 #include <QQuickImageProvider>
 #include <QJsonArray>
+#include <QMutex>
 
 // JQToolsLibrary import
 #include "JQToolsLibrary.h"

diff --git a/Library/MaterialUI/Element/BaseListItem.qml b/Library/MaterialUI/Element/BaseListItem.qml
diff --git a/Library/MaterialUI/Element/BottomSheet.qml b/Library/MaterialUI/Element/BottomSheet.qml
diff --git a/Library/MaterialUI/Element/CircleMask.qml b/Library/MaterialUI/Element/CircleMask.qml
diff --git a/Library/MaterialUI/Element/Divider.qml b/Library/MaterialUI/Element/Divider.qml
diff --git a/Library/MaterialUI/Element/Dropdown.qml b/Library/MaterialUI/Element/Dropdown.qml
diff --git a/Library/MaterialUI/Element/Ink.qml b/Library/MaterialUI/Element/Ink.qml
diff --git a/Library/MaterialUI/Element/PopupBase.qml b/Library/MaterialUI/Element/PopupBase.qml
diff --git a/Library/MaterialUI/Element/Scrollbar.qml b/Library/MaterialUI/Element/Scrollbar.qml
diff --git a/Library/MaterialUI/Element/Standard.qml b/Library/MaterialUI/Element/Standard.qml
diff --git a/Library/MaterialUI/Element/Subheader.qml b/Library/MaterialUI/Element/Subheader.qml
diff --git a/Library/MaterialUI/Element/ThemePalette.qml b/Library/MaterialUI/Element/ThemePalette.qml
diff --git a/Library/MaterialUI/Element/ThinDivider.qml b/Library/MaterialUI/Element/ThinDivider.qml
diff --git a/Library/MaterialUI/Element/View.qml b/Library/MaterialUI/Element/View.qml
diff --git a/Library/MaterialUI/Interface/MaterialActionButton.qml b/Library/MaterialUI/Interface/MaterialActionButton.qml
diff --git a/Library/MaterialUI/Interface/MaterialBottomActionSheet.qml b/Library/MaterialUI/Interface/MaterialBottomActionSheet.qml
diff --git a/Library/MaterialUI/Interface/MaterialButton.qml b/Library/MaterialUI/Interface/MaterialButton.qml
diff --git a/Library/MaterialUI/Interface/MaterialCheckBox.qml b/Library/MaterialUI/Interface/MaterialCheckBox.qml
diff --git a/Library/MaterialUI/Interface/MaterialDatePicker.qml b/Library/MaterialUI/Interface/MaterialDatePicker.qml
diff --git a/Library/MaterialUI/Interface/MaterialDialog.qml b/Library/MaterialUI/Interface/MaterialDialog.qml
diff --git a/Library/MaterialUI/Interface/MaterialDialogAlert.qml b/Library/MaterialUI/Interface/MaterialDialogAlert.qml
diff --git a/Library/MaterialUI/Interface/MaterialDialogConfirm.qml b/Library/MaterialUI/Interface/MaterialDialogConfirm.qml
diff --git a/Library/MaterialUI/Interface/MaterialDialogDatePicker.qml b/Library/MaterialUI/Interface/MaterialDialogDatePicker.qml
diff --git a/Library/MaterialUI/Interface/MaterialDialogPrompt.qml b/Library/MaterialUI/Interface/MaterialDialogPrompt.qml
diff --git a/Library/MaterialUI/Interface/MaterialDialogScrolling.qml b/Library/MaterialUI/Interface/MaterialDialogScrolling.qml
diff --git a/Library/MaterialUI/Interface/MaterialDialogTimePicker.qml b/Library/MaterialUI/Interface/MaterialDialogTimePicker.qml
diff --git a/Library/MaterialUI/Interface/MaterialLabel.qml b/Library/MaterialUI/Interface/MaterialLabel.qml
diff --git a/Library/MaterialUI/Interface/MaterialMenuField.qml b/Library/MaterialUI/Interface/MaterialMenuField.qml
diff --git a/Library/MaterialUI/Interface/MaterialPage.qml b/Library/MaterialUI/Interface/MaterialPage.qml
diff --git a/Library/MaterialUI/Interface/MaterialProgressBar.qml b/Library/MaterialUI/Interface/MaterialProgressBar.qml
diff --git a/Library/MaterialUI/Interface/MaterialProgressCircle.qml b/Library/MaterialUI/Interface/MaterialProgressCircle.qml
diff --git a/Library/MaterialUI/Interface/MaterialRadioButton.qml b/Library/MaterialUI/Interface/MaterialRadioButton.qml
diff --git a/Library/MaterialUI/Interface/MaterialSlider.qml b/Library/MaterialUI/Interface/MaterialSlider.qml
diff --git a/Library/MaterialUI/Interface/MaterialSnackbar.qml b/Library/MaterialUI/Interface/MaterialSnackbar.qml
diff --git a/Library/MaterialUI/Interface/MaterialSwipeToRefresh.qml b/Library/MaterialUI/Interface/MaterialSwipeToRefresh.qml
diff --git a/Library/MaterialUI/Interface/MaterialSwitch.qml b/Library/MaterialUI/Interface/MaterialSwitch.qml
diff --git a/Library/MaterialUI/Interface/MaterialTabbed.qml b/Library/MaterialUI/Interface/MaterialTabbed.qml
diff --git a/Library/MaterialUI/Interface/MaterialTableView.qml b/Library/MaterialUI/Interface/MaterialTableView.qml
diff --git a/Library/MaterialUI/Interface/MaterialTabs.qml b/Library/MaterialUI/Interface/MaterialTabs.qml
diff --git a/Library/MaterialUI/Interface/MaterialTextField.qml b/Library/MaterialUI/Interface/MaterialTextField.qml
diff --git a/Library/MaterialUI/Interface/MaterialTimePicker.qml b/Library/MaterialUI/Interface/MaterialTimePicker.qml
diff --git a/Library/MaterialUI/Interface/MaterialTreeView.qml b/Library/MaterialUI/Interface/MaterialTreeView.qml
diff --git a/Library/MaterialUI/Material-Design-Iconic-Font.ttf b/Library/MaterialUI/Material-Design-Iconic-Font.ttf
diff --git a/Library/MaterialUI/MaterialUI.pri b/Library/MaterialUI/MaterialUI.pri
diff --git a/Library/MaterialUI/MaterialUI.qml b/Library/MaterialUI/MaterialUI.qml
diff --git a/Library/MaterialUI/MaterialUI.qrc b/Library/MaterialUI/MaterialUI.qrc
diff --git a/README.md b/README.md
diff --git a/qml/Test.qml b/qml/Test.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.5
+import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtGraphicalEffects 1.0
 import "qrc:/MaterialUI/Interface/"