[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdevplatform [POSSIBLY UNSAFE]
From: Manuel Breugelmans <mbr.nxi () gmail ! com>
Date: 2008-06-26 10:00:00
Message-ID: 1214474400.784313.10059.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 824598 by mbreugel:
Move xtest to kdevplatform & rename.
M +1 -0 CMakeLists.txt
M +17 -3 cmake/modules/FindKDevPlatform.cmake
M +23 -11 tests/common/modeltest.cpp
A veritas (directory)
A veritas/CMakeLists.txt
A veritas/interfaces (directory)
A veritas/interfaces/itest.cpp [License: GPL (v2+)]
A veritas/interfaces/itest.h [License: GPL (v2+)]
A veritas/mainpage_
A veritas/proxymodelcommon.cpp [License: GPL (v2+)]
A veritas/proxymodelcommon.h [License: GPL (v2+)]
A veritas/register.h [License: GPL (v2+)]
A veritas/register.hpp [License: GPL (v2+)]
A veritas/resources (directory)
AM veritas/resources/arrow-right-bordeaux-16.png
AM veritas/resources/arrow-right-double-bordeaux-16.png
AM veritas/resources/checkedbox.png
AM veritas/resources/collapsed.png
AM veritas/resources/columns.png
AM veritas/resources/document.png
AM veritas/resources/error.png
AM veritas/resources/exception.png
AM veritas/resources/expanded.png
AM veritas/resources/fatal.png
AM veritas/resources/group.png
AM veritas/resources/info.png
AM veritas/resources/info_blue_24x24.png
AM veritas/resources/item.png
AM veritas/resources/item_run.png
AM veritas/resources/none.png
AM veritas/resources/play.png
AM veritas/resources/properties.png
A veritas/resources/qxrunner.qrc
AM veritas/resources/qxrunner_16x16.png
AM veritas/resources/qxrunner_24x24.png
AM veritas/resources/qxrunner_64x64.png
AM veritas/resources/stop.png
AM veritas/resources/success.png
AM veritas/resources/uncheckedbox.png
AM veritas/resources/warning.png
A veritas/resultsmodel.cpp [License: GPL (v2+)]
A veritas/resultsmodel.h [License: GPL (v2+)]
A veritas/resultsproxymodel.cpp [License: GPL (v2+)]
A veritas/resultsproxymodel.h [License: GPL (v2+)]
A veritas/resultsviewcontroller.cpp [License: GPL (v2+)]
A veritas/resultsviewcontroller.h [License: GPL (v2+)]
A veritas/runnermodel.cpp [License: GPL (v2+)]
A veritas/runnermodel.h [License: GPL (v2+)]
A veritas/runnermodelthread.cpp [License: GPL (v2+)]
A veritas/runnermodelthread.h [License: GPL (v2+)]
A veritas/runnerproxymodel.cpp [License: GPL (v2+)]
A veritas/runnerproxymodel.h [License: GPL (v2+)]
A veritas/runnerviewcontroller.cpp [License: GPL (v2+)]
A veritas/runnerviewcontroller.h [License: GPL (v2+)]
A veritas/runnerwindow.cpp [License: GPL (v2+)]
A veritas/runnerwindow.h [License: GPL (v2+)]
A veritas/runnerwindow.ui
A veritas/selectionmanager.cpp [License: GPL (v2+)]
A veritas/selectionmanager.h [POSSIBLY UNSAFE: gets] [License: GPL \
(v2+)] A veritas/selectiontoggle.cpp [License: GPL (v2+)]
A veritas/selectiontoggle.h [License: GPL (v2+)]
A veritas/statuswidget.cpp [License: GPL (v2+)]
A veritas/statuswidget.h [License: GPL (v2+)]
A veritas/statuswidget.ui
A veritas/stoppingdialog.cpp [License: GPL (v2+)]
A veritas/stoppingdialog.h [POSSIBLY UNSAFE: gets] [License: GPL \
(v2+)] A veritas/stoppingdialog.ui
A veritas/test.cpp [License: GPL (v2+)]
A veritas/test.h [License: GPL (v2+)]
A veritas/testcase.cpp [License: GPL (v2+)]
A veritas/testcase.h [License: GPL (v2+)]
A veritas/testcommand.cpp [License: GPL (v2+)]
A veritas/testcommand.h [License: GPL (v2+)]
AM veritas/testresult.cpp [License: GPL (v2+)]
AM veritas/testresult.h [License: GPL (v2+)]
A veritas/tests (directory)
A veritas/tests/CMakeLists.txt
A veritas/tests/kasserts.h [License: GPL (v2+)]
A veritas/tests/modelcreation.h [License: GPL (v2+)]
A veritas/tests/proxymodelcommontest.cpp [License: GPL (v2+)]
A veritas/tests/proxymodelcommontest.h [License: GPL (v2+)]
A veritas/tests/resultsmodeltest.cpp [License: GPL (v2+)]
A veritas/tests/resultsmodeltest.h [License: GPL (v2+)]
A veritas/tests/resultsproxymodeltest.cpp [License: GPL (v2+)]
A veritas/tests/resultsproxymodeltest.h [License: GPL (v2+)]
A veritas/tests/resultviewcontrollertest.cpp [License: GPL (v2+)]
A veritas/tests/resultviewcontrollertest.h [License: GPL (v2+)]
A veritas/tests/runnermodeltest.cpp [License: GPL (v2+)]
A veritas/tests/runnermodeltest.h [License: GPL (v2+)]
A veritas/tests/runnerproxymodeltest.cpp [License: GPL (v2+)]
A veritas/tests/runnerproxymodeltest.h [License: GPL (v2+)]
A veritas/tests/runnerviewcontrollertest.cpp [License: GPL (v2+)]
A veritas/tests/runnerviewcontrollertest.h [License: GPL (v2+)]
A veritas/tests/runnerwindowtest.cpp [License: GPL (v2+)]
A veritas/tests/runnerwindowtest.h [License: GPL (v2+)]
A veritas/tests/testtest.cpp [License: GPL (v2+)]
A veritas/tests/testtest.h [License: GPL (v2+)]
A veritas/tests/utilstest.cpp [License: GPL (v2+)]
A veritas/tests/utilstest.h [License: GPL (v2+)]
A veritas/tests/viewcontrollercommontest.cpp [License: GPL (v2+)]
A veritas/tests/viewcontrollercommontest.h [License: GPL (v2+)]
A veritas/utils.cpp [License: GPL (v2+)]
A veritas/utils.h [License: GPL (v2+)]
A veritas/veritasexport.h [License: LGPL (v2+)]
A veritas/viewcontrollercommon.cpp [License: GPL (v2+)]
A veritas/viewcontrollercommon.h [License: GPL (v2+)]
--- trunk/KDE/kdevplatform/CMakeLists.txt #824597:824598
@@ -31,5 +31,6 @@
add_subdirectory(outputview)
add_subdirectory(vcs)
add_subdirectory(plugins)
+add_subdirectory(veritas)
macro_optional_add_subdirectory(doc)
--- trunk/KDE/kdevplatform/cmake/modules/FindKDevPlatform.cmake #824597:824598
@@ -17,6 +17,7 @@
# KDEVPLATFORM_SHELL_LIBRARY - shell module library
# KDEVPLATFORM_UTIL_LIBRARY - util module library
# KDEVPLATFORM_VCS_LIBRARY - vcs module library
+# KDEVPLATFORM_VERITAS_LIBRARY - test module library
#
# KDEVPLATFORM_LIBRARIES - all platform module libraries
# KDEVPLATFORM_LIBRARY_DIR - the directory containing the KDevPlatform \
libraries @@ -132,6 +133,14 @@
if(NOT KDEVPLATFORM_VCS_LIBRARY)
message("Didn't find VCS")
endif(NOT KDEVPLATFORM_VCS_LIBRARY)
+find_library(KDEVPLATFORM_VERITAS_LIBRARY kdevplatformveritas
+ PATHS
+ ${KDEVPLATFORM_LIBRARY_DIR}
+ NO_DEFAULT_PATH
+)
+if(NOT KDEVPLATFORM_VERITAS_LIBRARY)
+message("Didn't find VERITAS")
+endif(NOT KDEVPLATFORM_VERITAS_LIBRARY)
if( KDEVPLATFORM_INCLUDE_DIR
AND KDEVPLATFORM_INTERFACES_LIBRARY
@@ -141,7 +150,8 @@
AND KDEVPLATFORM_SUBLIME_LIBRARY
AND KDEVPLATFORM_SHELL_LIBRARY
AND KDEVPLATFORM_UTIL_LIBRARY
- AND KDEVPLATFORM_VCS_LIBRARY )
+ AND KDEVPLATFORM_VCS_LIBRARY
+ AND KDEVPLATFORM_VERITAS_LIBRARY)
if( NOT KDevPlatform_FIND_QUIETLY )
message(STATUS "Found all KDevPlatform modules")
@@ -158,6 +168,7 @@
${KDEVPLATFORM_SHELL_LIBRARY}
${KDEVPLATFORM_UTIL_LIBRARY}
${KDEVPLATFORM_VCS_LIBRARY}
+ ${KDEVPLATFORM_VERITAS_LIBRARY}
)
set(KDEVPLATFORM_LIBRARIES ${KDEVPLATFORM_LIBRARIES} CACHE STRING "List of all \
kdevplatform module libraries") @@ -170,7 +181,8 @@
AND KDEVPLATFORM_SUBLIME_LIBRARY
AND KDEVPLATFORM_SHELL_LIBRARY
AND KDEVPLATFORM_UTIL_LIBRARY
- AND KDEVPLATFORM_VCS_LIBRARY )
+ AND KDEVPLATFORM_VCS_LIBRARY
+ AND KDEVPLATFORM_VERITAS_LIBRARY)
message(STATUS "You can set KDEVPLATFORM_INCLUDE_DIR and \
KDEVPLATFORM_LIBRARY_DIR to help cmake find KDevPlatform") if( \
KDevPlatform_FIND_REQUIRED) @@ -189,7 +201,8 @@
AND KDEVPLATFORM_SUBLIME_LIBRARY
AND KDEVPLATFORM_SHELL_LIBRARY
AND KDEVPLATFORM_UTIL_LIBRARY
- AND KDEVPLATFORM_VCS_LIBRARY )
+ AND KDEVPLATFORM_VCS_LIBRARY
+ AND KDEVPLATFORM_VERITAS_LIBRARY)
if(KDEVPLATFORM_FOUND)
message(STATUS "Using kdevplatform include dir: ${KDEVPLATFORM_INCLUDE_DIR}")
@@ -206,4 +219,5 @@
KDEVPLATFORM_SHELL_LIBRARY
KDEVPLATFORM_UTIL_LIBRARY
KDEVPLATFORM_VCS_LIBRARY
+ KDEVPLATFORM_VERITAS_LIBRARY
)
--- trunk/KDE/kdevplatform/tests/common/modeltest.cpp #824597:824598
@@ -416,17 +416,29 @@
QVariant textAlignmentVariant = model->data(model->index(0, 0), \
Qt::TextAlignmentRole); if (textAlignmentVariant.isValid()) {
int alignment = textAlignmentVariant.toInt();
- Q_ASSERT(alignment == Qt::AlignLeft ||
- alignment == Qt::AlignRight ||
- alignment == Qt::AlignHCenter ||
- alignment == Qt::AlignJustify ||
- alignment == Qt::AlignTop ||
- alignment == Qt::AlignBottom ||
- alignment == Qt::AlignVCenter ||
- alignment == Qt::AlignCenter ||
- alignment == Qt::AlignAbsolute ||
- alignment == Qt::AlignLeading ||
- alignment == Qt::AlignTrailing);
+ int halignment = alignment & Qt::AlignHorizontal_Mask;
+ int valignment = alignment & Qt::AlignVertical_Mask;
+ Q_ASSERT(alignment != 0);
+ Q_ASSERT(halignment == 0 ||
+ halignment == Qt::AlignLeft ||
+ halignment == Qt::AlignRight ||
+ halignment == Qt::AlignHCenter ||
+ halignment == Qt::AlignJustify);
+ Q_ASSERT(valignment == 0 ||
+ valignment == Qt::AlignTop ||
+ valignment == Qt::AlignBottom ||
+ valignment == Qt::AlignVCenter);
+/* Q_ASSERT(alignment == Qt::AlignLeft ||
+ alignment == Qt::AlignRight ||
+ alignment == Qt::AlignHCenter ||
+ alignment == Qt::AlignJustify ||
+ alignment == Qt::AlignTop ||
+ alignment == Qt::AlignBottom ||
+ alignment == Qt::AlignVCenter ||
+ alignment == Qt::AlignCenter ||
+ alignment == Qt::AlignAbsolute ||
+ alignment == Qt::AlignLeading ||
+ alignment == Qt::AlignTrailing);*/
}
// General Purpose roles that should return a QColor
** trunk/KDE/kdevplatform/veritas/resources/arrow-right-bordeaux-16.png #property \
svn:mime-type + application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/arrow-right-double-bordeaux-16.png \
#property svn:mime-type + application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/checkedbox.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/collapsed.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/columns.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/document.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/error.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/exception.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/expanded.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/fatal.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/group.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/info.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/info_blue_24x24.png #property \
svn:mime-type + application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/item.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/item_run.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/none.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/play.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/properties.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/qxrunner_16x16.png #property \
svn:mime-type + application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/qxrunner_24x24.png #property \
svn:mime-type + application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/qxrunner_64x64.png #property \
svn:mime-type + application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/stop.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/success.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/uncheckedbox.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/resources/warning.png #property svn:mime-type
+ application/octet-stream
** trunk/KDE/kdevplatform/veritas/testresult.cpp #property svn:executable
+ *
** trunk/KDE/kdevplatform/veritas/testresult.h #property svn:executable
+ *
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic