Browse Source

Minor fix for clang.

Import QML resources.
cl-refactor
Gav Wood 11 years ago
parent
commit
ddefcf456d
  1. 2
      libethereum/State.h
  2. 5
      walleth/CMakeLists.txt
  3. 4
      walleth/MainWin.cpp
  4. 5
      walleth/Resources.qrc
  5. 0
      walleth/Simple.qml

2
libethereum/State.h

@ -266,7 +266,7 @@ public:
#ifdef __clang__ #ifdef __clang__
auto it = m_store->find(_n); auto it = m_store->find(_n);
if (it == m_store->end()) if (it == m_store->end())
m_store->insert(make_pair(_n, _v)); m_store->insert(std::make_pair(_n, _v));
else else
m_store->at(_n) = _v; m_store->at(_n) = _v;
#else #else

5
walleth/CMakeLists.txt

@ -29,6 +29,7 @@ find_package(Qt5Quick REQUIRED)
find_package(Qt5Qml REQUIRED) find_package(Qt5Qml REQUIRED)
find_package(Qt5Network REQUIRED) find_package(Qt5Network REQUIRED)
qt5_wrap_ui(ui_Main.h Main.ui) qt5_wrap_ui(ui_Main.h Main.ui)
qt5_add_resources(RESOURCE_ADDED Resources.qrc)
# Set name of binary and add_executable() # Set name of binary and add_executable()
if (APPLE) if (APPLE)
@ -47,10 +48,10 @@ if (APPLE)
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTEABLE}) set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTEABLE})
include(BundleUtilities) include(BundleUtilities)
add_executable(${EXECUTEABLE} MACOSX_BUNDLE Main.ui ${SRC_LIST}) add_executable(${EXECUTEABLE} MACOSX_BUNDLE Main.ui ${RESOURCE_ADDED} ${SRC_LIST})
else () else ()
set(EXECUTEABLE walleth) set(EXECUTEABLE walleth)
add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST}) add_executable(${EXECUTEABLE} Main.ui ${RESOURCE_ADDED} ${SRC_LIST})
endif () endif ()
qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network Quick Qml) qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network Quick Qml)

4
walleth/MainWin.cpp

@ -83,8 +83,8 @@ Main::Main(QWidget *parent) :
context->setContextProperty("graphs", graphs()); context->setContextProperty("graphs", graphs());
context->setContextProperty("audio", audio()); context->setContextProperty("audio", audio());
context->setContextProperty("view", view()); context->setContextProperty("view", view());
m_view->setSource(QUrl("qrc:/Noted.qml")); */ m_view->setSource(QUrl("qrc:/Simple.qml"));
*/
QWidget* w = QWidget::createWindowContainer(m_view); QWidget* w = QWidget::createWindowContainer(m_view);
w->setAcceptDrops(true); w->setAcceptDrops(true);

5
walleth/Resources.qrc

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/">
<file>Simple.qml</file>
</qresource>
</RCC>

0
walleth/Simple.qml

Loading…
Cancel
Save