From 1782d5ad9a646ca2a6fab90da5f04c879ddaecd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 10 Aug 2013 18:34:08 +0200 Subject: Implement icon picker, bring back raster icons. --- CMakeLists.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e858d888..d907e152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,8 +176,8 @@ gui/instancemodel.h gui/instancedelegate.h gui/versionselectdialog.h gui/lwjglselectdialog.h -gui/iconcache.h gui/instancesettings.h +gui/IconPickerDialog.h java/annotations.h java/classfile.h @@ -209,8 +209,8 @@ gui/instancemodel.cpp gui/instancedelegate.cpp gui/versionselectdialog.cpp gui/lwjglselectdialog.cpp -gui/iconcache.cpp gui/instancesettings.cpp +gui/IconPickerDialog.cpp java/javautils.cpp java/annotations.cpp @@ -232,6 +232,7 @@ gui/consolewindow.ui gui/versionselectdialog.ui gui/lwjglselectdialog.ui gui/instancesettings.ui +gui/IconPickerDialog.ui ) @@ -284,15 +285,6 @@ IF(BUILD_KEYRING_TEST) TARGET_LINK_LIBRARIES(Test libUtil libSettings) ENDIF() -option(BUILD_ASSET_TEST "Build the asset sync test binary" OFF) -IF(BUILD_ASSET_TEST) - # test.cpp - ADD_EXECUTABLE(AssetTest asset_test.cpp) - QT5_USE_MODULES(AssetTest Core Network) - TARGET_LINK_LIBRARIES(AssetTest libUtil backend libSettings) -ENDIF() - - ################################ INSTALLATION AND PACKAGING ################################ # use QtCreator's QTDIR var IF(DEFINED ENV{QTDIR}) -- cgit v1.2.3