1 files changed, 23 insertions, 9 deletions

diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index 303f8b31f6..a8df4fcff6 100644
--- a/utils/themeeditor/themeeditor.pro
+++ b/utils/themeeditor/themeeditor.pro
@@ -22,16 +22,19 @@ INCLUDEPATH += gui
 INCLUDEPATH += models
 INCLUDEPATH += graphics
 INCLUDEPATH += quazip
-
-cross {
+INCLUDEPATH += qtfindreplacedialog
+cross { 
     message("Crossbuilding for W32 binary")
+    
     # retrieve ar binary for w32 cross compile. This might be specific to
     # Fedora mingw32 packages of Qt. Using member() here is needed because at
     # least the F13 packages add ar options to the variable.
     CROSSOPTIONS += AR=$$member(QMAKE_LIB)
+    
     # make sure we use the correct subsystem to prevent a console window coming up.
     LIBS += -Wl,-subsystem,windows
 }
+
 # Stuff for the parse lib
 libskin_parser.commands = @$(MAKE) \
     TARGET_DIR=$$MYBUILDDIR \
@@ -66,7 +69,6 @@ HEADERS += models/parsetreemodel.h \
     gui/devicestate.h \
     graphics/rbalbumart.h \
     graphics/rbprogressbar.h \
-    gui/findreplacedialog.h \
     graphics/rbtext.h \
     graphics/rbfontcache.h \
     graphics/rbtextcache.h \
@@ -84,7 +86,13 @@ HEADERS += models/parsetreemodel.h \
     quazip/crypt.h \
     zlib/zlib.h \
     zlib/zconf.h \
-    gui/fontdownloader.h
+    gui/fontdownloader.h \
+    qtfindreplacedialog/varianteditor.h \
+    qtfindreplacedialog/findreplace_global.h \
+    qtfindreplacedialog/findreplaceform.h \
+    qtfindreplacedialog/findreplacedialog.h \
+    qtfindreplacedialog/findform.h \
+    qtfindreplacedialog/finddialog.h
 SOURCES += main.cpp \
     models/parsetreemodel.cpp \
     models/parsetreenode.cpp \
@@ -104,7 +112,6 @@ SOURCES += main.cpp \
     gui/devicestate.cpp \
     graphics/rbalbumart.cpp \
     graphics/rbprogressbar.cpp \
-    gui/findreplacedialog.cpp \
     graphics/rbtext.cpp \
     graphics/rbfontcache.cpp \
     graphics/rbtextcache.cpp \
@@ -118,7 +125,12 @@ SOURCES += main.cpp \
     quazip/quazipfile.cpp \
     quazip/quazip.cpp \
     quazip/ioapi.c \
-    gui/fontdownloader.cpp
+    gui/fontdownloader.cpp \
+    qtfindreplacedialog/varianteditor.cpp \
+    qtfindreplacedialog/findreplaceform.cpp \
+    qtfindreplacedialog/findreplacedialog.cpp \
+    qtfindreplacedialog/findform.cpp \
+    qtfindreplacedialog/finddialog.cpp
 OTHER_FILES += README \
     resources/windowicon.png \
     resources/appicon.xcf \
@@ -142,15 +154,17 @@ OTHER_FILES += README \
     resources/cursor.png \
     resources/targetdb \
     quazip/README.ROCKBOX \
-    quazip/LICENSE.GPL
+    quazip/LICENSE.GPL \
+    qtfindreplacedialog/dialogs.pro
 FORMS += gui/editorwindow.ui \
     gui/preferencesdialog.ui \
     gui/configdocument.ui \
     gui/skinviewer.ui \
-    gui/findreplacedialog.ui \
     gui/skintimer.ui \
     gui/newprojectdialog.ui \
-    gui/fontdownloader.ui
+    gui/fontdownloader.ui \
+    qtfindreplacedialog/findreplaceform.ui \
+    qtfindreplacedialog/findreplacedialog.ui
 RESOURCES += resources.qrc
 win32:RC_FILE = themeeditor.rc
 macx {