rbutil: Merge rbutil with utils folder.

rbutil uses several components from the utils folder, and can be
considered part of utils too. Having it in a separate folder is an
arbitrary split that doesn't help anymore these days, so merge them.

This also allows other utils to easily use libtools.make without the
need to navigate to a different folder.

Change-Id: I3fc2f4de19e3e776553efb5dea5f779dfec0dc21

1 files changed, 37 insertions, 0 deletions

diff --git a/utils/rbutilqt/test/test-compareversion.pro b/utils/rbutilqt/test/test-compareversion.pro
new file mode 100644
index 0000000000..c8e5a899ac
--- /dev/null
+++ b/utils/rbutilqt/test/test-compareversion.pro
@@ -0,0 +1,37 @@
+#
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+# All files in this archive are subject to the GNU General Public License.
+# See the file COPYING in the source tree root for full license agreement.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+
+# Test: Utils::compareVersionStrings().
+#
+
+QT += testlib
+
+TEMPLATE = app
+TARGET = test-compareversion
+INCLUDEPATH += . ../base stubs
+
+# Input
+SOURCES += \
+    test-compareversion.cpp \
+    stubs/stubs-compareversion.cpp \
+    ../base/utils.cpp
+
+HEADERS += \
+    ../base/rbsettings.h \
+    ../base/playerbuildinfo.h \
+    ../base/rockboxinfo.h \
+    ../base/utils.h
+